@catladder/cli 0.0.0-main-bbb9c8e8 → 0.0.0-main-ee4d2a94

package/dist/bundles/catenv/index.js

@@ -6060,9 +6060,9 @@ exports.createJobsForAgentContext = createJobsForAgentContext;
 
 "use strict";
 
-// prompts.ts — MCP-only, DRY, review-first-then-push, CI logic, self-mention guard,
+// prompts.ts — MCP-only, DRY, review-first-then-push, CI diagnosis (no retries), self-mention guard,
 // event prompt supports review-on-demand via manual "agent-review" job or fallback MR review.
-// Prevents double-runs: event-triggered work cancels any running "agent-review" job on the same MR.
+// Prevents double-runs: event-triggered work cancels any running "agent-review" job on the MR's own pipeline.
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getMergeRequestPrompt = exports.getEventPrompt = void 0;
 /* ---------- Shared blocks ---------- */
@@ -6140,10 +6140,10 @@ const mcpOnly = () => `
   - merge_merge_request(...)  // **Do NOT use** (never merge)
 
 - **Pipelines / Jobs**  (requires env USE_PIPELINE=true)
+  - list_pipelines({ projectId, ref?, sha?, status?, orderBy?, sort? })
+  - get_pipeline({ projectId, pipelineId })
   - list_pipeline_jobs({ projectId, pipelineId })
   - get_pipeline_job_output({ projectId, pipelineId, jobId })
-  - retry_pipeline({ projectId, pipelineId })
-  - retry_pipeline_job({ projectId, jobId })
   - play_pipeline_job({ projectId, jobId })
   - cancel_pipeline_job({ projectId, jobId })
 `;
@@ -6167,40 +6167,47 @@ From \`event_json\`, extract:
 
 If any key is missing, choose the safest minimal action or briefly explain via a comment.
 `;
-// NEW: Single-runner guard (event-triggered → existing MR)
+/* Helper used by Single-Runner Guard and Review-on-Demand to find the MR’s own pipeline */
+const resolveMrPipeline = () => `
+## Resolve MR Pipeline (for MR IID resolved from the event)
+Given \`mr_iid\`:
+1) Call \`get_merge_request({ projectId: $CI_PROJECT_ID, mergeRequestIid: mr_iid })\` to obtain:
+   - \`sourceBranch\` (required)
+   - \`sha\` or head SHA (if available)
+2) Prefer **SHA-based** lookup:
+   - \`list_pipelines({ projectId: $CI_PROJECT_ID, sha })\` ordered by most recent; pick the newest.
+3) Fallback to **ref-based** lookup if SHA not available:
+   - \`list_pipelines({ projectId: $CI_PROJECT_ID, ref: sourceBranch, orderBy: "updated_at", sort: "desc" })\`; pick the newest.
+4) The chosen pipeline becomes \`mr_pipeline_id\`. Use it for all job queries/plays/cancels related to this MR.
+- If no pipeline is found, post a short MR note explaining that no pipeline was located for the current MR head and proceed with review actions without CI job control.
+`;
+// Updated: operate on the MR’s pipeline, not the event pipeline
 const singleRunnerGuard = () => `
 ## Single-Runner Guard (event-triggered work on an existing MR)
 Before entering MR Review Mode from an event:
 
-- **Goal:** Avoid two agents working the same MR. If a **running or pending** CI job whose name **ends with "agent-review"** is active for this MR, **cancel** it first.
-
-**Best-effort procedure (MCP-only):**
-1) If \`$CI_PIPELINE_ID\` is available (this event is executing inside a CI context for the same MR):
-   - Call \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: $CI_PIPELINE_ID })\`.
-   - Identify any job where \`status\` is \`"running"\` or \`"pending"\` **and** \`name\` **endsWith** \`"agent-review"\`.
-   - For each match, call \`cancel_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
-   - Proceed with review immediately after issuing cancellations (do not wait).
-
-2) If \`$CI_PIPELINE_ID\` is **not** available, or jobs for this MR cannot be listed with available MCP calls:
-   - Post a short MR note stating you are proceeding but **cannot verify/cancel** a running \`agent-review\` job due to missing capabilities.
+- **Goal:** Avoid two agents working the same MR. If a **running or pending** CI job whose name **ends with "agent-review"** is active for this MR's pipeline, **cancel** it first.
+
+**Procedure (MCP-only):**
+1) Resolve the MR IID from the event (target URL or text) and run **Resolve MR Pipeline** to get \`mr_pipeline_id\`.
+2) If \`mr_pipeline_id\` is available:
+   - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+   - For any job with \`status\` in \`["running","pending"]\` and \`name\` ending with \`"agent-review"\`, call:
+     - \`cancel_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
+   - Proceed immediately after issuing cancellations (do not wait).
+3) If the pipeline cannot be resolved:
+   - Post a short MR note stating you are proceeding but **cannot verify/cancel** a running \`agent-review\` job due to missing pipeline context.
    - Proceed with review.
 
 **Notes:**
 - Keep this guard **idempotent** (safe to run multiple times).
-- This guard only applies to **event-triggered** flows that decide to act on an **existing MR**.
+- Only applies to **event-triggered** flows that act on an **existing MR**.
 `;
 const reviewOnDemandFromEvents = () => `
 ## Review-on-Demand (from events)
 If the issue/note text **asks for a review** (case-insensitive tokens like: "review", "please review", "PTAL", "needs review", "can you look at", "LGTM?"), then:
 
-1) **Check for pipeline review job**
-   - List jobs for the current pipeline \`$CI_PIPELINE_ID\` via \`list_pipeline_jobs\`.
-   - If any job has \`status = "manual"\` **and** its \`name\` ends with "agent-review":
-     - Trigger it via \`play_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
-     - Post a short comment confirming you triggered the review job (sanitize).
-     - **Stop** further review actions.
-
-2) **If no such job exists, resolve which MR to review**:
+1) **Resolve which MR to review**:
    - If the event target is an MR → use its \`iid\`.
    - Else, parse the text for MR references in order:
      - \`!<iid>\` (e.g., \`!123\`)
@@ -6208,10 +6215,21 @@ If the issue/note text **asks for a review** (case-insensitive tokens like: "rev
      - full GitLab MR URL
    - If no MR can be resolved, reply with a brief comment asking the user to reference an MR (sanitize) and **stop**.
 
-3) **Single-Runner Guard (cancel any running "agent-review" job)**   // NEW: Single-runner guard
-   - Execute the **Single-Runner Guard** steps above **before** MR Review Mode.
+2) **Find the MR's pipeline** (do **not** use \`$CI_PIPELINE_ID\` from the event):
+   - Execute **Resolve MR Pipeline** to obtain \`mr_pipeline_id\`.
+
+3) **If a manual "agent-review" job exists on the MR pipeline, trigger it**
+   - If \`mr_pipeline_id\` is available:
+     - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+     - If any job has \`status = "manual"\` **and** its \`name\` ends with "agent-review":
+       - Trigger via \`play_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
+       - Post a short comment confirming you triggered the review job (sanitize).
+       - **Stop** further review actions.
+
+4) **Single-Runner Guard**
+   - If no manual job was triggered, execute the **Single-Runner Guard** (it will cancel any running/pending \`agent-review\` jobs on the MR pipeline) before MR Review Mode.
 
-4) **Enter MR Review Mode**: execute the **MR Review Bundle** below with the resolved \`mr_iid\`.
+5) **Enter MR Review Mode**: execute the **MR Review Bundle** below with the resolved \`mr_iid\`.
 `;
 /** Regular event workflow for non-review work */
 const eventWorkflow = ({ agentUserName }) => `
@@ -6267,30 +6285,21 @@ Follow this sequence with verification at each step:
    - Post a follow-up MR note summarizing what changed and why (sanitize).
 `;
 const ciInspection = () => `
-4) **CI jobs (current pipeline focus: diagnose first, retry only when useful)**
-   - Inspect jobs for the **current pipeline**: \`$CI_PIPELINE_ID\` via \`list_pipeline_jobs\`.
-   - Consider **only** jobs with \`status = "failed"\` and \`allow_failure = false\`.
-   - For each such job:
-     1. Retrieve details (id, name, stage, status, allow_failure, web_url).
-     2. Fetch job output via \`get_pipeline_job_output({ projectId: $CI_PROJECT_ID, pipelineId: $CI_PIPELINE_ID, jobId })\`.
-     3. **Classify the failure**:
-        - **Code-related (do not retry):** compiler/type/lint/test/build script errors.
-        - **Likely transient (may retry):** network/timeouts/infra/cache/artifacts/5xx/429/etc.
-     4. **Decision**:
-        - If \`will_push_changes = true\`:
-          - **Do not retry** current pipeline (upcoming push will trigger a new one).
-          - Post an MR note: brief diagnosis per failed job; note a new pipeline will validate the fix (sanitize).
-        - If \`will_push_changes = false\`:
-          - If transient ⇒ \`retry_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\` (or \`retry_pipeline\` if job-level retry not available).  
-            Post a note stating you retried and why (sanitize).
-          - If code-related ⇒ do not retry; post a note with diagnosis and suggested fix (sanitize).
-   - Retry-once policy: at most **one** retry per job in this run.
-
-5) **Assign human reviewer if ready**
-   - If discussions are resolved and blocking CI issues are addressed or clearly triaged, request review from a recent active human contributor (not you), if supported by your environment.
-
-6) **Stdout summary**
-   - Print concise summary: branch used, files changed count (approx by diffs), discussions resolved/left, **blocking failed jobs (names + stages)** with classification (code vs transient), which jobs were retried (if any), and requested reviewers.
+4) **CI jobs (diagnose only; no job retries)**
+   - To analyze CI context during review triggered from events, prefer the **MR pipeline** (not the event pipeline).
+   - If you are in MR Review Mode and have \`mr_pipeline_id\` (from **Resolve MR Pipeline**):
+     - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+     - Consider **only** jobs with \`status = "failed"\` and \`allow_failure = false\`.
+     - For each such job:
+       1. Retrieve details (id, name, stage, status, allow_failure, web_url).
+       2. Fetch job output via \`get_pipeline_job_output({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id, jobId })\`.
+       3. **Classify the failure**:
+          - **Code-related:** compiler/type/lint/test/build script errors. Provide minimal fix in your review/changes. Do **not** retry.
+          - **Likely transient / infra:** network/timeouts/cache/artifacts/5xx/429/runner issues. Do **not** retry here; note likely cause and suggest CI-level retry/backoff if appropriate.
+       4. **Decision**:
+          - If \`will_push_changes = true\`: do **not** retry; note that the new pipeline from your push will validate fixes.
+          - If \`will_push_changes = false\`: do **not** retry; post diagnosis and next steps (or request human input for infra issues).
+   - If \`mr_pipeline_id\` is not available, you may skip CI analysis or post a short note explaining the missing pipeline context.
 `;
 const outputDisciplineMR = ({ agentUserName }) => `
 ## Output Discipline (MR)
@@ -6320,9 +6329,10 @@ ${identity(ctx)}
 ${goldenRules(ctx)}
 ${selfMentionGuard(ctx)}
 ${eventSelfParse()}
-${singleRunnerGuard()}  <!-- NEW: included so the agent can run it when acting on an existing MR -->
+${resolveMrPipeline()}   <!-- new helper used by review/cancel paths -->
+${singleRunnerGuard()}   <!-- operates on MR pipeline, not event pipeline -->
 ${reviewOnDemandFromEvents()}
-${mrReviewBundle(ctx)}  <!-- Included so the agent can execute it when review intent is true -->
+${mrReviewBundle(ctx)}   <!-- included so the agent can execute it when review intent is true -->
 ${eventWorkflow(ctx)}
 ${commentGuidelines()}
 ${mcpOnly()}

package/dist/bundles/cli/index.js

@@ -9242,9 +9242,9 @@ exports.createJobsForAgentContext = createJobsForAgentContext;
 
 "use strict";
 
-// prompts.ts — MCP-only, DRY, review-first-then-push, CI logic, self-mention guard,
+// prompts.ts — MCP-only, DRY, review-first-then-push, CI diagnosis (no retries), self-mention guard,
 // event prompt supports review-on-demand via manual "agent-review" job or fallback MR review.
-// Prevents double-runs: event-triggered work cancels any running "agent-review" job on the same MR.
+// Prevents double-runs: event-triggered work cancels any running "agent-review" job on the MR's own pipeline.
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getMergeRequestPrompt = exports.getEventPrompt = void 0;
 /* ---------- Shared blocks ---------- */
@@ -9322,10 +9322,10 @@ const mcpOnly = () => `
   - merge_merge_request(...)  // **Do NOT use** (never merge)
 
 - **Pipelines / Jobs**  (requires env USE_PIPELINE=true)
+  - list_pipelines({ projectId, ref?, sha?, status?, orderBy?, sort? })
+  - get_pipeline({ projectId, pipelineId })
   - list_pipeline_jobs({ projectId, pipelineId })
   - get_pipeline_job_output({ projectId, pipelineId, jobId })
-  - retry_pipeline({ projectId, pipelineId })
-  - retry_pipeline_job({ projectId, jobId })
   - play_pipeline_job({ projectId, jobId })
   - cancel_pipeline_job({ projectId, jobId })
 `;
@@ -9349,40 +9349,47 @@ From \`event_json\`, extract:
 
 If any key is missing, choose the safest minimal action or briefly explain via a comment.
 `;
-// NEW: Single-runner guard (event-triggered → existing MR)
+/* Helper used by Single-Runner Guard and Review-on-Demand to find the MR’s own pipeline */
+const resolveMrPipeline = () => `
+## Resolve MR Pipeline (for MR IID resolved from the event)
+Given \`mr_iid\`:
+1) Call \`get_merge_request({ projectId: $CI_PROJECT_ID, mergeRequestIid: mr_iid })\` to obtain:
+   - \`sourceBranch\` (required)
+   - \`sha\` or head SHA (if available)
+2) Prefer **SHA-based** lookup:
+   - \`list_pipelines({ projectId: $CI_PROJECT_ID, sha })\` ordered by most recent; pick the newest.
+3) Fallback to **ref-based** lookup if SHA not available:
+   - \`list_pipelines({ projectId: $CI_PROJECT_ID, ref: sourceBranch, orderBy: "updated_at", sort: "desc" })\`; pick the newest.
+4) The chosen pipeline becomes \`mr_pipeline_id\`. Use it for all job queries/plays/cancels related to this MR.
+- If no pipeline is found, post a short MR note explaining that no pipeline was located for the current MR head and proceed with review actions without CI job control.
+`;
+// Updated: operate on the MR’s pipeline, not the event pipeline
 const singleRunnerGuard = () => `
 ## Single-Runner Guard (event-triggered work on an existing MR)
 Before entering MR Review Mode from an event:
 
-- **Goal:** Avoid two agents working the same MR. If a **running or pending** CI job whose name **ends with "agent-review"** is active for this MR, **cancel** it first.
-
-**Best-effort procedure (MCP-only):**
-1) If \`$CI_PIPELINE_ID\` is available (this event is executing inside a CI context for the same MR):
-   - Call \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: $CI_PIPELINE_ID })\`.
-   - Identify any job where \`status\` is \`"running"\` or \`"pending"\` **and** \`name\` **endsWith** \`"agent-review"\`.
-   - For each match, call \`cancel_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
-   - Proceed with review immediately after issuing cancellations (do not wait).
-
-2) If \`$CI_PIPELINE_ID\` is **not** available, or jobs for this MR cannot be listed with available MCP calls:
-   - Post a short MR note stating you are proceeding but **cannot verify/cancel** a running \`agent-review\` job due to missing capabilities.
+- **Goal:** Avoid two agents working the same MR. If a **running or pending** CI job whose name **ends with "agent-review"** is active for this MR's pipeline, **cancel** it first.
+
+**Procedure (MCP-only):**
+1) Resolve the MR IID from the event (target URL or text) and run **Resolve MR Pipeline** to get \`mr_pipeline_id\`.
+2) If \`mr_pipeline_id\` is available:
+   - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+   - For any job with \`status\` in \`["running","pending"]\` and \`name\` ending with \`"agent-review"\`, call:
+     - \`cancel_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
+   - Proceed immediately after issuing cancellations (do not wait).
+3) If the pipeline cannot be resolved:
+   - Post a short MR note stating you are proceeding but **cannot verify/cancel** a running \`agent-review\` job due to missing pipeline context.
    - Proceed with review.
 
 **Notes:**
 - Keep this guard **idempotent** (safe to run multiple times).
-- This guard only applies to **event-triggered** flows that decide to act on an **existing MR**.
+- Only applies to **event-triggered** flows that act on an **existing MR**.
 `;
 const reviewOnDemandFromEvents = () => `
 ## Review-on-Demand (from events)
 If the issue/note text **asks for a review** (case-insensitive tokens like: "review", "please review", "PTAL", "needs review", "can you look at", "LGTM?"), then:
 
-1) **Check for pipeline review job**
-   - List jobs for the current pipeline \`$CI_PIPELINE_ID\` via \`list_pipeline_jobs\`.
-   - If any job has \`status = "manual"\` **and** its \`name\` ends with "agent-review":
-     - Trigger it via \`play_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
-     - Post a short comment confirming you triggered the review job (sanitize).
-     - **Stop** further review actions.
-
-2) **If no such job exists, resolve which MR to review**:
+1) **Resolve which MR to review**:
    - If the event target is an MR → use its \`iid\`.
    - Else, parse the text for MR references in order:
      - \`!<iid>\` (e.g., \`!123\`)
@@ -9390,10 +9397,21 @@ If the issue/note text **asks for a review** (case-insensitive tokens like: "rev
      - full GitLab MR URL
    - If no MR can be resolved, reply with a brief comment asking the user to reference an MR (sanitize) and **stop**.
 
-3) **Single-Runner Guard (cancel any running "agent-review" job)**   // NEW: Single-runner guard
-   - Execute the **Single-Runner Guard** steps above **before** MR Review Mode.
+2) **Find the MR's pipeline** (do **not** use \`$CI_PIPELINE_ID\` from the event):
+   - Execute **Resolve MR Pipeline** to obtain \`mr_pipeline_id\`.
+
+3) **If a manual "agent-review" job exists on the MR pipeline, trigger it**
+   - If \`mr_pipeline_id\` is available:
+     - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+     - If any job has \`status = "manual"\` **and** its \`name\` ends with "agent-review":
+       - Trigger via \`play_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
+       - Post a short comment confirming you triggered the review job (sanitize).
+       - **Stop** further review actions.
+
+4) **Single-Runner Guard**
+   - If no manual job was triggered, execute the **Single-Runner Guard** (it will cancel any running/pending \`agent-review\` jobs on the MR pipeline) before MR Review Mode.
 
-4) **Enter MR Review Mode**: execute the **MR Review Bundle** below with the resolved \`mr_iid\`.
+5) **Enter MR Review Mode**: execute the **MR Review Bundle** below with the resolved \`mr_iid\`.
 `;
 /** Regular event workflow for non-review work */
 const eventWorkflow = ({ agentUserName }) => `
@@ -9449,30 +9467,21 @@ Follow this sequence with verification at each step:
    - Post a follow-up MR note summarizing what changed and why (sanitize).
 `;
 const ciInspection = () => `
-4) **CI jobs (current pipeline focus: diagnose first, retry only when useful)**
-   - Inspect jobs for the **current pipeline**: \`$CI_PIPELINE_ID\` via \`list_pipeline_jobs\`.
-   - Consider **only** jobs with \`status = "failed"\` and \`allow_failure = false\`.
-   - For each such job:
-     1. Retrieve details (id, name, stage, status, allow_failure, web_url).
-     2. Fetch job output via \`get_pipeline_job_output({ projectId: $CI_PROJECT_ID, pipelineId: $CI_PIPELINE_ID, jobId })\`.
-     3. **Classify the failure**:
-        - **Code-related (do not retry):** compiler/type/lint/test/build script errors.
-        - **Likely transient (may retry):** network/timeouts/infra/cache/artifacts/5xx/429/etc.
-     4. **Decision**:
-        - If \`will_push_changes = true\`:
-          - **Do not retry** current pipeline (upcoming push will trigger a new one).
-          - Post an MR note: brief diagnosis per failed job; note a new pipeline will validate the fix (sanitize).
-        - If \`will_push_changes = false\`:
-          - If transient ⇒ \`retry_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\` (or \`retry_pipeline\` if job-level retry not available).  
-            Post a note stating you retried and why (sanitize).
-          - If code-related ⇒ do not retry; post a note with diagnosis and suggested fix (sanitize).
-   - Retry-once policy: at most **one** retry per job in this run.
-
-5) **Assign human reviewer if ready**
-   - If discussions are resolved and blocking CI issues are addressed or clearly triaged, request review from a recent active human contributor (not you), if supported by your environment.
-
-6) **Stdout summary**
-   - Print concise summary: branch used, files changed count (approx by diffs), discussions resolved/left, **blocking failed jobs (names + stages)** with classification (code vs transient), which jobs were retried (if any), and requested reviewers.
+4) **CI jobs (diagnose only; no job retries)**
+   - To analyze CI context during review triggered from events, prefer the **MR pipeline** (not the event pipeline).
+   - If you are in MR Review Mode and have \`mr_pipeline_id\` (from **Resolve MR Pipeline**):
+     - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+     - Consider **only** jobs with \`status = "failed"\` and \`allow_failure = false\`.
+     - For each such job:
+       1. Retrieve details (id, name, stage, status, allow_failure, web_url).
+       2. Fetch job output via \`get_pipeline_job_output({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id, jobId })\`.
+       3. **Classify the failure**:
+          - **Code-related:** compiler/type/lint/test/build script errors. Provide minimal fix in your review/changes. Do **not** retry.
+          - **Likely transient / infra:** network/timeouts/cache/artifacts/5xx/429/runner issues. Do **not** retry here; note likely cause and suggest CI-level retry/backoff if appropriate.
+       4. **Decision**:
+          - If \`will_push_changes = true\`: do **not** retry; note that the new pipeline from your push will validate fixes.
+          - If \`will_push_changes = false\`: do **not** retry; post diagnosis and next steps (or request human input for infra issues).
+   - If \`mr_pipeline_id\` is not available, you may skip CI analysis or post a short note explaining the missing pipeline context.
 `;
 const outputDisciplineMR = ({ agentUserName }) => `
 ## Output Discipline (MR)
@@ -9502,9 +9511,10 @@ ${identity(ctx)}
 ${goldenRules(ctx)}
 ${selfMentionGuard(ctx)}
 ${eventSelfParse()}
-${singleRunnerGuard()}  <!-- NEW: included so the agent can run it when acting on an existing MR -->
+${resolveMrPipeline()}   <!-- new helper used by review/cancel paths -->
+${singleRunnerGuard()}   <!-- operates on MR pipeline, not event pipeline -->
 ${reviewOnDemandFromEvents()}
-${mrReviewBundle(ctx)}  <!-- Included so the agent can execute it when review intent is true -->
+${mrReviewBundle(ctx)}   <!-- included so the agent can execute it when review intent is true -->
 ${eventWorkflow(ctx)}
 ${commentGuidelines()}
 ${mcpOnly()}

package/dist/pipeline/src/pipeline/agent/prompts.js

@@ -1,7 +1,7 @@
 "use strict";
-// prompts.ts — MCP-only, DRY, review-first-then-push, CI logic, self-mention guard,
+// prompts.ts — MCP-only, DRY, review-first-then-push, CI diagnosis (no retries), self-mention guard,
 // event prompt supports review-on-demand via manual "agent-review" job or fallback MR review.
-// Prevents double-runs: event-triggered work cancels any running "agent-review" job on the same MR.
+// Prevents double-runs: event-triggered work cancels any running "agent-review" job on the MR's own pipeline.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMergeRequestPrompt = exports.getEventPrompt = void 0;
 /* ---------- Shared blocks ---------- */
@@ -79,10 +79,10 @@ const mcpOnly = () => `
   - merge_merge_request(...)  // **Do NOT use** (never merge)
 
 - **Pipelines / Jobs**  (requires env USE_PIPELINE=true)
+  - list_pipelines({ projectId, ref?, sha?, status?, orderBy?, sort? })
+  - get_pipeline({ projectId, pipelineId })
   - list_pipeline_jobs({ projectId, pipelineId })
   - get_pipeline_job_output({ projectId, pipelineId, jobId })
-  - retry_pipeline({ projectId, pipelineId })
-  - retry_pipeline_job({ projectId, jobId })
   - play_pipeline_job({ projectId, jobId })
   - cancel_pipeline_job({ projectId, jobId })
 `;
@@ -106,40 +106,47 @@ From \`event_json\`, extract:
 
 If any key is missing, choose the safest minimal action or briefly explain via a comment.
 `;
-// NEW: Single-runner guard (event-triggered → existing MR)
+/* Helper used by Single-Runner Guard and Review-on-Demand to find the MR’s own pipeline */
+const resolveMrPipeline = () => `
+## Resolve MR Pipeline (for MR IID resolved from the event)
+Given \`mr_iid\`:
+1) Call \`get_merge_request({ projectId: $CI_PROJECT_ID, mergeRequestIid: mr_iid })\` to obtain:
+   - \`sourceBranch\` (required)
+   - \`sha\` or head SHA (if available)
+2) Prefer **SHA-based** lookup:
+   - \`list_pipelines({ projectId: $CI_PROJECT_ID, sha })\` ordered by most recent; pick the newest.
+3) Fallback to **ref-based** lookup if SHA not available:
+   - \`list_pipelines({ projectId: $CI_PROJECT_ID, ref: sourceBranch, orderBy: "updated_at", sort: "desc" })\`; pick the newest.
+4) The chosen pipeline becomes \`mr_pipeline_id\`. Use it for all job queries/plays/cancels related to this MR.
+- If no pipeline is found, post a short MR note explaining that no pipeline was located for the current MR head and proceed with review actions without CI job control.
+`;
+// Updated: operate on the MR’s pipeline, not the event pipeline
 const singleRunnerGuard = () => `
 ## Single-Runner Guard (event-triggered work on an existing MR)
 Before entering MR Review Mode from an event:
 
-- **Goal:** Avoid two agents working the same MR. If a **running or pending** CI job whose name **ends with "agent-review"** is active for this MR, **cancel** it first.
-
-**Best-effort procedure (MCP-only):**
-1) If \`$CI_PIPELINE_ID\` is available (this event is executing inside a CI context for the same MR):
-   - Call \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: $CI_PIPELINE_ID })\`.
-   - Identify any job where \`status\` is \`"running"\` or \`"pending"\` **and** \`name\` **endsWith** \`"agent-review"\`.
-   - For each match, call \`cancel_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
-   - Proceed with review immediately after issuing cancellations (do not wait).
+- **Goal:** Avoid two agents working the same MR. If a **running or pending** CI job whose name **ends with "agent-review"** is active for this MR's pipeline, **cancel** it first.
 
-2) If \`$CI_PIPELINE_ID\` is **not** available, or jobs for this MR cannot be listed with available MCP calls:
-   - Post a short MR note stating you are proceeding but **cannot verify/cancel** a running \`agent-review\` job due to missing capabilities.
+**Procedure (MCP-only):**
+1) Resolve the MR IID from the event (target URL or text) and run **Resolve MR Pipeline** to get \`mr_pipeline_id\`.
+2) If \`mr_pipeline_id\` is available:
+   - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+   - For any job with \`status\` in \`["running","pending"]\` and \`name\` ending with \`"agent-review"\`, call:
+     - \`cancel_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
+   - Proceed immediately after issuing cancellations (do not wait).
+3) If the pipeline cannot be resolved:
+   - Post a short MR note stating you are proceeding but **cannot verify/cancel** a running \`agent-review\` job due to missing pipeline context.
    - Proceed with review.
 
 **Notes:**
 - Keep this guard **idempotent** (safe to run multiple times).
-- This guard only applies to **event-triggered** flows that decide to act on an **existing MR**.
+- Only applies to **event-triggered** flows that act on an **existing MR**.
 `;
 const reviewOnDemandFromEvents = () => `
 ## Review-on-Demand (from events)
 If the issue/note text **asks for a review** (case-insensitive tokens like: "review", "please review", "PTAL", "needs review", "can you look at", "LGTM?"), then:
 
-1) **Check for pipeline review job**
-   - List jobs for the current pipeline \`$CI_PIPELINE_ID\` via \`list_pipeline_jobs\`.
-   - If any job has \`status = "manual"\` **and** its \`name\` ends with "agent-review":
-     - Trigger it via \`play_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
-     - Post a short comment confirming you triggered the review job (sanitize).
-     - **Stop** further review actions.
-
-2) **If no such job exists, resolve which MR to review**:
+1) **Resolve which MR to review**:
    - If the event target is an MR → use its \`iid\`.
    - Else, parse the text for MR references in order:
      - \`!<iid>\` (e.g., \`!123\`)
@@ -147,10 +154,21 @@ If the issue/note text **asks for a review** (case-insensitive tokens like: "rev
      - full GitLab MR URL
    - If no MR can be resolved, reply with a brief comment asking the user to reference an MR (sanitize) and **stop**.
 
-3) **Single-Runner Guard (cancel any running "agent-review" job)**   // NEW: Single-runner guard
-   - Execute the **Single-Runner Guard** steps above **before** MR Review Mode.
+2) **Find the MR's pipeline** (do **not** use \`$CI_PIPELINE_ID\` from the event):
+   - Execute **Resolve MR Pipeline** to obtain \`mr_pipeline_id\`.
+
+3) **If a manual "agent-review" job exists on the MR pipeline, trigger it**
+   - If \`mr_pipeline_id\` is available:
+     - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+     - If any job has \`status = "manual"\` **and** its \`name\` ends with "agent-review":
+       - Trigger via \`play_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\`.
+       - Post a short comment confirming you triggered the review job (sanitize).
+       - **Stop** further review actions.
 
-4) **Enter MR Review Mode**: execute the **MR Review Bundle** below with the resolved \`mr_iid\`.
+4) **Single-Runner Guard**
+   - If no manual job was triggered, execute the **Single-Runner Guard** (it will cancel any running/pending \`agent-review\` jobs on the MR pipeline) before MR Review Mode.
+
+5) **Enter MR Review Mode**: execute the **MR Review Bundle** below with the resolved \`mr_iid\`.
 `;
 /** Regular event workflow for non-review work */
 const eventWorkflow = ({ agentUserName }) => `
@@ -206,30 +224,21 @@ Follow this sequence with verification at each step:
    - Post a follow-up MR note summarizing what changed and why (sanitize).
 `;
 const ciInspection = () => `
-4) **CI jobs (current pipeline focus: diagnose first, retry only when useful)**
-   - Inspect jobs for the **current pipeline**: \`$CI_PIPELINE_ID\` via \`list_pipeline_jobs\`.
-   - Consider **only** jobs with \`status = "failed"\` and \`allow_failure = false\`.
-   - For each such job:
-     1. Retrieve details (id, name, stage, status, allow_failure, web_url).
-     2. Fetch job output via \`get_pipeline_job_output({ projectId: $CI_PROJECT_ID, pipelineId: $CI_PIPELINE_ID, jobId })\`.
-     3. **Classify the failure**:
-        - **Code-related (do not retry):** compiler/type/lint/test/build script errors.
-        - **Likely transient (may retry):** network/timeouts/infra/cache/artifacts/5xx/429/etc.
-     4. **Decision**:
-        - If \`will_push_changes = true\`:
-          - **Do not retry** current pipeline (upcoming push will trigger a new one).
-          - Post an MR note: brief diagnosis per failed job; note a new pipeline will validate the fix (sanitize).
-        - If \`will_push_changes = false\`:
-          - If transient ⇒ \`retry_pipeline_job({ projectId: $CI_PROJECT_ID, jobId })\` (or \`retry_pipeline\` if job-level retry not available).  
-            Post a note stating you retried and why (sanitize).
-          - If code-related ⇒ do not retry; post a note with diagnosis and suggested fix (sanitize).
-   - Retry-once policy: at most **one** retry per job in this run.
-
-5) **Assign human reviewer if ready**
-   - If discussions are resolved and blocking CI issues are addressed or clearly triaged, request review from a recent active human contributor (not you), if supported by your environment.
-
-6) **Stdout summary**
-   - Print concise summary: branch used, files changed count (approx by diffs), discussions resolved/left, **blocking failed jobs (names + stages)** with classification (code vs transient), which jobs were retried (if any), and requested reviewers.
+4) **CI jobs (diagnose only; no job retries)**
+   - To analyze CI context during review triggered from events, prefer the **MR pipeline** (not the event pipeline).
+   - If you are in MR Review Mode and have \`mr_pipeline_id\` (from **Resolve MR Pipeline**):
+     - \`list_pipeline_jobs({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id })\`.
+     - Consider **only** jobs with \`status = "failed"\` and \`allow_failure = false\`.
+     - For each such job:
+       1. Retrieve details (id, name, stage, status, allow_failure, web_url).
+       2. Fetch job output via \`get_pipeline_job_output({ projectId: $CI_PROJECT_ID, pipelineId: mr_pipeline_id, jobId })\`.
+       3. **Classify the failure**:
+          - **Code-related:** compiler/type/lint/test/build script errors. Provide minimal fix in your review/changes. Do **not** retry.
+          - **Likely transient / infra:** network/timeouts/cache/artifacts/5xx/429/runner issues. Do **not** retry here; note likely cause and suggest CI-level retry/backoff if appropriate.
+       4. **Decision**:
+          - If \`will_push_changes = true\`: do **not** retry; note that the new pipeline from your push will validate fixes.
+          - If \`will_push_changes = false\`: do **not** retry; post diagnosis and next steps (or request human input for infra issues).
+   - If \`mr_pipeline_id\` is not available, you may skip CI analysis or post a short note explaining the missing pipeline context.
 `;
 const outputDisciplineMR = ({ agentUserName }) => `
 ## Output Discipline (MR)
@@ -259,9 +268,10 @@ ${identity(ctx)}
 ${goldenRules(ctx)}
 ${selfMentionGuard(ctx)}
 ${eventSelfParse()}
-${singleRunnerGuard()}  <!-- NEW: included so the agent can run it when acting on an existing MR -->
+${resolveMrPipeline()}   <!-- new helper used by review/cancel paths -->
+${singleRunnerGuard()}   <!-- operates on MR pipeline, not event pipeline -->
 ${reviewOnDemandFromEvents()}
-${mrReviewBundle(ctx)}  <!-- Included so the agent can execute it when review intent is true -->
+${mrReviewBundle(ctx)}   <!-- included so the agent can execute it when review intent is true -->
 ${eventWorkflow(ctx)}
 ${commentGuidelines()}
 ${mcpOnly()}

package/dist/pipeline/src/pipeline/agent/prompts.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/prompts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/prompts.ts"],"names":[],"mappings":"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"}