@catladder/cli 3.15.0 → 3.16.0

package/dist/cli/src/apps/cli/commands/project/setup/setupAgents.js

@@ -4,6 +4,7 @@ exports.setupAgents = void 0;
 const gitlab_1 = require("../../../../../utils/gitlab");
 const getProjectConfig_1 = require("../../../../../config/getProjectConfig");
 const gitProjectInformation_1 = require("../../../../../git/gitProjectInformation");
+const git_1 = require("../../../../../git");
 const listTriggerTokens = async (instance, projectId) => {
     return await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/triggers`);
 };
@@ -25,7 +26,8 @@ const updateWebhook = async (instance, projectId, hookId, webhookData) => {
 const setupAgentWebhook = async (instance, projectId, agentName, triggerToken) => {
     const webhookName = `cl_agent_${agentName}_webhook`;
     const { gitRemoteHost } = await (0, gitProjectInformation_1.getGitRemoteHostAndPath)();
-    const webhookUrl = `https://${gitRemoteHost}/api/v4/projects/${projectId}/ref/main/trigger/pipeline?token=${triggerToken}`;
+    const mainBranch = await (0, git_1.getMainBranch)();
+    const webhookUrl = `https://${gitRemoteHost}/api/v4/projects/${projectId}/ref/${mainBranch}/trigger/pipeline?token=${triggerToken}`;
     instance.log(`Setting up webhook for agent: ${agentName}`);
     // List existing webhooks
     const existingWebhooks = await listWebhooks(instance, projectId);

package/dist/cli/src/apps/cli/commands/project/setup/setupAgents.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupAgents.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAgents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setupAgents.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupAgents.ts"],"names":[],"mappings":"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"}

package/dist/cli/src/git/getGetMainBranch.d.ts

@@ -0,0 +1 @@
+export declare const getMainBranch: () => Promise<string>;

package/dist/cli/src/git/getGetMainBranch.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMainBranch = void 0;
+const child_process_promise_1 = require("child-process-promise");
+const getMainBranch = async () => {
+    const { stdout } = await (0, child_process_promise_1.exec)("git rev-parse --abbrev-ref HEAD");
+    return stdout.trim();
+};
+exports.getMainBranch = getMainBranch;
+//# sourceMappingURL=getGetMainBranch.js.map

package/dist/cli/src/git/getGetMainBranch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getGetMainBranch.js","sourceRoot":"","sources":["../../../../src/git/getGetMainBranch.ts"],"names":[],"mappings":";;;AAAA,iEAA6C;AACtC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IACtC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,4BAAI,EAAC,iCAAiC,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB"}

package/dist/cli/src/git/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./gitConfig";
 export * from "./gitProjectInformation";
+export * from "./getGetMainBranch";

package/dist/cli/src/git/index.js

@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./gitConfig"), exports);
 __exportStar(require("./gitProjectInformation"), exports);
+__exportStar(require("./getGetMainBranch"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cli/src/git/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/git/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,0DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/git/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,0DAAwC;AACxC,qDAAmC"}

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,
-// 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.
+// prompts.ts — MCP-only, DRY, review-first-then-push, CI diagnosis (no retries), self-mention guard,
+// conversations-aware: always read the thread first (issues & MRs), reply inline, avoid duplicates.
+// 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 ---------- */
@@ -24,6 +24,30 @@ const goldenRules = ({ agentUserName }) => `
 - Keep actions minimal and idempotent. Avoid duplicate comments or duplicate MRs.
 - Use ONE stable \`source_branch\` per run; do not regenerate its name later.
 `;
+/* ---------- NEW: conversation intake + threading rules ---------- */
+const conversationsIntake = ({ agentUserName }) => `
+## Conversations Intake & Threading (MANDATORY before acting)
+Always load and reason about the current conversation to avoid duplicates and to respond in the right place.
+
+### What to fetch
+- **MRs**: Use \`mr_discussions({ projectId: $CI_PROJECT_ID, mergeRequestIid })\` to load all threads and notes.
+- **Issues**: If an issue-discussions/listing tool exists, use it. If not available in \`gitlab-mcp\`, rely on the **event payload** and **your last note ids** if present; otherwise post a single concise note acknowledging the limitation and proceed.
+
+### How to use it
+1) **Detect review/answer context**:
+   - Identify the **latest human note** in the thread (exclude notes authored by "${agentUserName}").
+   - If the latest human note **replies to you** (mentions you or is in a discussion you started), reply **in the same discussion**.
+2) **De-duplication**:
+   - If your most recent message is the **last message overall** and **no one else replied** since, prefer **updating your last note** instead of posting a new one:
+     - Use \`update_merge_request_note\` or \`update_issue_note\` accordingly.
+3) **Reply placement**:
+   - For MR code discussions: reply **inline in the same discussion** (preserve thread context).
+   - For general/MR overview threads: add a single consolidated reply (avoid multiple scattered notes).
+4) **Sanitize before write**:
+   - Apply the Self-mention Guard, then post.
+5) **If conversations list is unavailable**:
+   - Post one short note: that you cannot fetch the full conversation due to missing MCP capability, then proceed minimally (no spam).
+`;
 const selfMentionGuard = ({ agentUserName }) => `
 ## Self-mention Guard (mandatory preflight for ALL writes)
 Before ANY call that writes text (comment/create/update MR/issue/commit message), sanitize the text:
@@ -64,11 +88,11 @@ const mcpOnly = () => `
   - list_issues({ projectId, state?: "opened"|"closed", scope?: "all"|... })
 
 - **Branch & Files**
-  - create_branch({ projectId, branchName, ref })                 // ref = default branch or SHA
+  - create_branch({ projectId, branchName, ref })
   - push_files({ projectId, branch, commitMessage, files: [{ filePath, content }] })
   - create_or_update_file({ projectId, branch, filePath, content, commitMessage })
   - get_file_contents({ projectId, ref, path })
-  - get_branch_diffs({ projectId, from, to })                      // compare refs
+  - get_branch_diffs({ projectId, from, to })
 
 - **Merge Requests**
   - create_merge_request({ projectId, sourceBranch, targetBranch, title, description, assigneeUsernames?: string[] })
@@ -79,10 +103,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 })
 `;
@@ -103,43 +127,48 @@ From \`event_json\`, extract:
 - note_id if present (\`#note_<id>\`)
 - description/body text, state, author \`user_username\`, timestamps
 - project id/path; detect default branch via \`get_merge_request\`/context as needed
-
-If any key is missing, choose the safest minimal action or briefly explain via a comment.
+- If available: the discussion id / thread context of the note to enable inline replies.
+`;
+/* 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.
 `;
-// NEW: Single-runner guard (event-triggered → existing MR)
 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,32 +176,47 @@ 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 })\`.
+       - **Conversations Intake**: run the section above to determine **where** to post the confirmation (prefer replying in the same thread that requested review).
+       - 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 }) => `
 ## High-Reliability Workflow (sequence + postconditions)
 Follow this order for any change work:
 
+0) **Conversations Intake (MANDATORY)**:
+   - For MR targets: call \`mr_discussions\` and apply the rules in **Conversations Intake & Threading**.
+   - For issue targets: attempt to load notes if supported; otherwise rely on event context and post one concise note acknowledging the limitation.
+
 1) **Acknowledge** with a short comment on the issue/MR thread (\`create_note\`), **unless the last actor is you**.
 2) **Discover default branch** (e.g., "main") — infer from repo/MR context if needed.
 3) **Create a working branch** from default (stable name, e.g., \`fix/issue-<iid>-<slug>\` or \`feat/issue-<iid>-<slug>\`) via \`create_branch\`.
 4) **Write changes → commit → push to remote branch** via \`push_files\` (or \`create_or_update_file\`).
 5) **Verify push landed**:
-   - Fetch latest state (optional: \`get_file_contents\`/log) and capture a short SHA from the branch head if exposed by the host.
-   - Compare default vs \`source_branch\` via \`get_branch_diffs({ from: "<default>", to: "<source>" })\` and ensure there are diffs.
+   - Fetch latest state and ensure diffs via \`get_branch_diffs({ from: "<default>", to: "<source>" })\`.
 6) **Create or update MR** ONLY if there is a non-empty diff via \`create_merge_request\`.
    - Include \`Closes #<issue_iid>\` in MR description when applicable.
    - **Assign the MR to yourself**: \`assigneeUsernames: ["${agentUserName}"]\`.
-7) **Follow-up comment** with branch name, any commit short SHA you can obtain, files changed count (approx by diffs), and MR link via \`create_note\`, **unless the last actor is you**.
+7) **Follow-up comment** with branch name, any commit short SHA you can obtain, files changed count (approx by diffs), and MR link via \`create_note\`, **unless the last actor is you**. Place this **in the relevant conversation thread** (see Intake rules).
 8) **If verification fails**:
    - Do NOT create the MR.
    - Comment the exact failure and retry once with a fresh branch name. If still failing, comment and stop.
 
-For Q&A-only (no code changes), just post a concise, helpful answer on the same issue/MR (sanitize first).
+For Q&A-only (no code changes), run **Conversations Intake** first, then post a single concise, helpful answer **in the correct thread** (sanitize).
 `;
 /* ---------- MR-review specific (shared with both prompts) ---------- */
 const mrScope = ({ agentUserName }) => `
@@ -189,7 +233,7 @@ Follow this sequence with verification at each step:
 1) **Collect context**
    - Get MR metadata via \`get_merge_request({ projectId: $CI_PROJECT_ID, mergeRequestIid })\`.
    - Fetch the full changeset/diffs via \`get_merge_request_diffs\` (or \`list_merge_request_diffs\`) and open discussions via \`mr_discussions\`.
-   - Read existing notes to avoid duplication.
+   - **Conversations Intake**: analyze discussions to find latest human notes, detect replies to the agent, and decide between inline reply vs updating your prior note.
 
 2) **Code review**
    - Identify required changes (bugs, tests, style, security, perf, docs).
@@ -203,33 +247,24 @@ Follow this sequence with verification at each step:
    - Apply minimal, safe changes; keep commits small and clear.
    - **Push** to the MR's **source branch** via \`push_files\` (or \`create_or_update_file\`).
    - **Verify push landed** using \`get_branch_diffs({ from: "<target_branch>", to: "<source_branch>" })\` and ensure there are diffs.
-   - Post a follow-up MR note summarizing what changed and why (sanitize).
+   - Post a follow-up MR note summarizing what changed and why, **in the appropriate thread** (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)**
+   - Prefer the **MR pipeline** (not the event pipeline).
+   - If you 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)
@@ -258,10 +293,12 @@ $(cat $TRIGGER_PAYLOAD)
 ${identity(ctx)}
 ${goldenRules(ctx)}
 ${selfMentionGuard(ctx)}
+${conversationsIntake(ctx)}     <!-- NEW: mandatory before acting -->
 ${eventSelfParse()}
-${singleRunnerGuard()}  <!-- NEW: included so the agent can run it when acting on an existing MR -->
+${resolveMrPipeline()}           <!-- 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)}           <!-- agent can execute when review intent is true -->
 ${eventWorkflow(ctx)}
 ${commentGuidelines()}
 ${mcpOnly()}
@@ -281,6 +318,7 @@ description: $CI_MERGE_REQUEST_DESCRIPTION
 ${mrScope(ctx)}
 ${goldenRules(ctx)}
 ${selfMentionGuard(ctx)}
+${conversationsIntake(ctx)}     <!-- NEW: always read MR discussions -->
 ${mrWorkflow()}
 ${ciInspection()}
 ${commentGuidelines()}

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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"}

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

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.callClaude = exports.baseSetupScript = exports.createBaseAgentJob = void 0;
 const bashEscape_1 = require("../../bash/bashEscape");
+const runner_1 = require("../../runner");
 const createBaseAgentJob = (context) => ({
     stage: "agents",
     envMode: "none",
-    image: "node:24-alpine3.21",
+    // image: "node:24-alpine3.21",
+    image: (0, runner_1.getRunnerImage)("agent-claude"),
     variables: {
         MAX_MCP_OUTPUT_TOKENS: "75000",
         GITLAB_PERSONAL_ACCESS_TOKEN: "$AGENT_GITLAB_PERSONAL_ACCESS_TOKEN", // TODO: we don't have global secret keys to configure yet
@@ -14,9 +16,10 @@ const createBaseAgentJob = (context) => ({
 });
 exports.createBaseAgentJob = createBaseAgentJob;
 exports.baseSetupScript = [
-    "apk update",
-    "apk add --no-cache git curl bash",
-    "npm install -g @anthropic-ai/claude-code",
+    // these are done in the image already
+    // "apk update",
+    // "apk add --no-cache git curl bash",
+    //"npm install -g @anthropic-ai/claude-code",
     "claude mcp add gitlab --env GITLAB_PERSONAL_ACCESS_TOKEN=$GITLAB_PERSONAL_ACCESS_TOKEN --env GITLAB_API_URL=$GITLAB_API_URL --env USE_PIPELINE='true' -- npx -y @zereight/mcp-gitlab",
 ];
 const callClaude = ({ prompt }) => {

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

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/shared.ts"],"names":[],"mappings":";;;AAAA,sDAI+B;AAGxB,MAAM,kBAAkB,GAAG,CAChC,OAAqB,EAC4B,EAAE,CAAC,CAAC;IACrD,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,MAAM;IACf,KAAK,EAAE,oBAAoB;IAC3B,SAAS,EAAE;QACT,qBAAqB,EAAE,OAAO;QAC9B,4BAA4B,EAAE,qCAAqC,EAAE,0DAA0D;QAC/H,cAAc,EAAE,gBAAgB;KACjC;CACF,CAAC,CAAC;AAXU,QAAA,kBAAkB,sBAW5B;AAEU,QAAA,eAAe,GAAG;IAC7B,YAAY;IACZ,kCAAkC;IAClC,0CAA0C;IAC1C,sLAAsL;CACvL,CAAC;AAEK,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAsB,EAAE,EAAE;IAC3D,OAAO;QACL,kBAAkB,IAAA,2BAAc,EAC9B,IAAA,+BAAkB,EAAC,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC,CAC5C,GAAG;QACJ,mBAAmB;QACnB,wJAAwJ;KACzJ,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,UAAU,cAQrB"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/agent/shared.ts"],"names":[],"mappings":";;;AAAA,sDAI+B;AAC/B,yCAA8C;AAGvC,MAAM,kBAAkB,GAAG,CAChC,OAAqB,EAC4B,EAAE,CAAC,CAAC;IACrD,KAAK,EAAE,QAAQ;IACf,OAAO,EAAE,MAAM;IACf,+BAA+B;IAC/B,KAAK,EAAE,IAAA,uBAAc,EAAC,cAAc,CAAC;IACrC,SAAS,EAAE;QACT,qBAAqB,EAAE,OAAO;QAC9B,4BAA4B,EAAE,qCAAqC,EAAE,0DAA0D;QAC/H,cAAc,EAAE,gBAAgB;KACjC;CACF,CAAC,CAAC;AAZU,QAAA,kBAAkB,sBAY5B;AAEU,QAAA,eAAe,GAAG;IAC7B,sCAAsC;IACtC,gBAAgB;IAChB,sCAAsC;IACtC,6CAA6C;IAC7C,sLAAsL;CACvL,CAAC;AAEK,MAAM,UAAU,GAAG,CAAC,EAAE,MAAM,EAAsB,EAAE,EAAE;IAC3D,OAAO;QACL,kBAAkB,IAAA,2BAAc,EAC9B,IAAA,+BAAkB,EAAC,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC,CAC5C,GAAG;QACJ,mBAAmB;QACnB,wJAAwJ;KACzJ,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,UAAU,cAQrB"}

package/dist/pipeline/src/runner/index.d.ts

@@ -1,2 +1,2 @@
-export type RunnerImageName = "jobs-default" | "jobs-meteor" | "jobs-testing-chrome" | "kubernetes" | "docker-build" | "gcloud" | "semantic-release";
+export type RunnerImageName = "jobs-default" | "jobs-meteor" | "jobs-testing-chrome" | "kubernetes" | "docker-build" | "gcloud" | "semantic-release" | "agent-claude";
 export declare const getRunnerImage: (imageName: RunnerImageName) => string;

package/dist/pipeline/src/runner/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/runner/index.ts"],"names":[],"mappings":";;;AAAA,4CAAmE;AAU5D,MAAM,cAAc,GAAG,CAAC,SAA0B,EAAE,EAAE,CAC3D,2BAAe,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,8BAAkB,CAAC;AADlD,QAAA,cAAc,kBACoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/runner/index.ts"],"names":[],"mappings":";;;AAAA,4CAAmE;AAW5D,MAAM,cAAc,GAAG,CAAC,SAA0B,EAAE,EAAE,CAC3D,2BAAe,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,8BAAkB,CAAC;AADlD,QAAA,cAAc,kBACoC"}