@agentrix/agentrix-run 0.6.0 → 0.8.0

package/dist/index.cjs

@@ -8,17 +8,21 @@ const DEFAULT_WAIT_TIMEOUT_SECONDS = 1800;
 const DEFAULT_AGENTRIX_BASE_URL = "https://agentrix.xmz.ai";
 function usage() {
   return [
-    "Usage: agentrix-run --agent <agent> --prompt <prompt> [options]",
+    "Usage: agentrix-run (--agent <agent> | --resume <task-id>) --prompt <prompt> [options]",
     "",
     "Options:",
     "  --title <text>",
     "  --allow-filesystem-agent",
+    "  --resume <task-id>",
     "  --repo <json>",
     "  --output-schema <json>",
     "  --ref <ref>",
     "  --sha <sha>",
     "  --base-ref <ref>",
     "  --head-ref <ref>",
+    "  --head-sha <sha>",
+    "  --checkout-ref <ref>",
+    "  --checkout-sha <sha>",
     "  --branch-name <name>",
     "  --pr-number <number>",
     "  --issue-number <number>",
@@ -181,6 +185,10 @@ function parseArgs(argv) {
       case "--allow-filesystem-agent":
         options.allowFilesystemAgent = true;
         break;
+      case "--resume":
+        options.resumeTaskId = requireValue(argv, index, arg);
+        index += 1;
+        break;
       case "--title":
         options.title = requireValue(argv, index, arg);
         index += 1;
@@ -213,6 +221,18 @@ function parseArgs(argv) {
         options.headRef = requireValue(argv, index, arg);
         index += 1;
         break;
+      case "--head-sha":
+        options.headSha = requireValue(argv, index, arg);
+        index += 1;
+        break;
+      case "--checkout-ref":
+        options.checkoutRef = requireValue(argv, index, arg);
+        index += 1;
+        break;
+      case "--checkout-sha":
+        options.checkoutSha = requireValue(argv, index, arg);
+        index += 1;
+        break;
       case "--branch-name":
         options.branchName = requireValue(argv, index, arg);
         index += 1;
@@ -268,12 +288,15 @@ function parseArgs(argv) {
         throw new Error(`Unknown argument: ${arg}`);
     }
   }
-  if (!options.agent.trim()) {
+  if (!options.resumeTaskId && !options.agent.trim()) {
     throw new Error("--agent is required");
   }
   if (!options.prompt.trim()) {
     throw new Error("--prompt is required");
   }
+  if (options.resumeTaskId !== void 0 && !options.resumeTaskId.trim()) {
+    throw new Error("--resume must be a non-empty task ID");
+  }
   return options;
 }
 function normalizeRef(value) {
@@ -317,6 +340,15 @@ function optionalPositiveInt(value) {
   const parsed = Number.parseInt(value, 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
 }
+function firstEnv(...names) {
+  for (const name of names) {
+    const value = process.env[name];
+    if (value) {
+      return value;
+    }
+  }
+  return void 0;
+}
 function readBooleanEnv(name) {
   const value = process.env[name]?.trim().toLowerCase();
   return value === "1" || value === "true" || value === "yes" || value === "on";
@@ -359,6 +391,7 @@ function detectGithub() {
       sha: process.env.GITHUB_SHA,
       baseRef: process.env.GITHUB_BASE_REF || getNestedString(payload, "pull_request", "base", "ref"),
       headRef: process.env.GITHUB_HEAD_REF || getNestedString(payload, "pull_request", "head", "ref"),
+      headSha: getNestedString(payload, "pull_request", "head", "sha"),
       prNumber: getNestedNumber(payload, "pull_request", "number"),
       issueNumber: getNestedNumber(payload, "issue", "number")
     },
@@ -383,19 +416,24 @@ function detectGitlab() {
       name: repository.name
     },
     git: {
-      ref: process.env.CI_COMMIT_REF_NAME,
-      sha: process.env.CI_COMMIT_SHA,
-      baseRef: process.env.CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
-      headRef: process.env.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME,
-      prNumber: optionalPositiveInt(process.env.CI_MERGE_REQUEST_IID),
-      issueNumber: optionalPositiveInt(process.env.AGENTRIX_ISSUE_NUMBER)
+      ref: firstEnv("GITLAB_BRIDGE_REF_NAME", "CI_COMMIT_REF_NAME"),
+      sha: firstEnv(
+        "GITLAB_BRIDGE_HEAD_SHA",
+        "GITLAB_BRIDGE_WORKFLOW_RUN_SHA",
+        "CI_COMMIT_SHA"
+      ),
+      baseRef: firstEnv("GITLAB_BRIDGE_BASE_REF", "CI_MERGE_REQUEST_TARGET_BRANCH_NAME"),
+      headRef: firstEnv("GITLAB_BRIDGE_HEAD_REF", "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"),
+      headSha: firstEnv("GITLAB_BRIDGE_HEAD_SHA", "CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"),
+      prNumber: optionalPositiveInt(firstEnv("GITLAB_BRIDGE_PR_NUMBER", "CI_MERGE_REQUEST_IID")),
+      issueNumber: optionalPositiveInt(firstEnv("GITLAB_BRIDGE_ISSUE_NUMBER", "AGENTRIX_ISSUE_NUMBER"))
     },
     context: {
       ciProvider: "gitlab_ci",
-      eventName: process.env.AGENTRIX_EVENT_NAME || process.env.CI_PIPELINE_SOURCE,
-      eventAction: process.env.AGENTRIX_EVENT_ACTION,
+      eventName: firstEnv("GITLAB_BRIDGE_EVENT_NAME", "CI_PIPELINE_SOURCE"),
+      eventAction: process.env.GITLAB_BRIDGE_EVENT_ACTION,
       jobUrl: process.env.CI_JOB_URL,
-      runUrl: process.env.CI_PIPELINE_URL
+      runUrl: firstEnv("GITLAB_BRIDGE_WORKFLOW_RUN_URL", "CI_PIPELINE_URL")
     }
   };
 }
@@ -431,6 +469,9 @@ function buildRequest(options, detected) {
       sha: options.sha ?? detected.git?.sha,
       baseRef: options.baseRef ?? detected.git?.baseRef,
       headRef: options.headRef ?? detected.git?.headRef,
+      headSha: options.headSha ?? detected.git?.headSha,
+      checkoutRef: options.checkoutRef ?? detected.git?.checkoutRef,
+      checkoutSha: options.checkoutSha ?? detected.git?.checkoutSha,
       branchName: options.branchName || process.env.AGENTRIX_BRANCH_NAME,
       prNumber: options.prNumber ?? detected.git?.prNumber,
       issueNumber: options.issueNumber ?? detected.git?.issueNumber
@@ -441,10 +482,10 @@ function buildRequest(options, detected) {
     },
     context: detected.context?.ciProvider ? {
       ciProvider: detected.context.ciProvider,
-      eventName: process.env.AGENTRIX_EVENT_NAME || detected.context.eventName,
-      eventAction: process.env.AGENTRIX_EVENT_ACTION || detected.context.eventAction,
+      eventName: detected.context.eventName,
+      eventAction: detected.context.eventAction,
       jobUrl: process.env.AGENTRIX_JOB_URL || detected.context.jobUrl,
-      runUrl: process.env.AGENTRIX_RUN_URL || detected.context.runUrl,
+      runUrl: detected.context.runUrl,
       payload: detected.context.payload
     } : void 0,
     metadata: Object.keys(options.metadata).length > 0 ? options.metadata : void 0
@@ -483,6 +524,36 @@ async function createRun(baseUrl, apiKey, request) {
   const response = await requestJson("POST", `${baseUrl}/v1/ci/runs`, apiKey, request);
   return shared.CreateCiRunResponseSchema.parse(response);
 }
+function createPromptMessage(text) {
+  return {
+    type: "user",
+    message: {
+      role: "user",
+      content: text.trim()
+    },
+    parent_tool_use_id: null,
+    session_id: ""
+  };
+}
+function buildResumeMessageRequest(options) {
+  return {
+    message: createPromptMessage(options.prompt),
+    target: "agent",
+    senderType: "human",
+    senderId: "agentrix-run",
+    senderName: "agentrix-run",
+    responseMode: options.responseMode
+  };
+}
+async function sendResumeMessage(baseUrl, apiKey, taskId, request) {
+  const response = await requestJson(
+    "POST",
+    `${baseUrl}/v1/tasks/${encodeURIComponent(taskId)}/send-message`,
+    apiKey,
+    request
+  );
+  return shared.SendTaskMessageResponseSchema.parse(response);
+}
 function exitCodeForStatus(status) {
   return status === "completed" ? 0 : 1;
 }
@@ -567,12 +638,12 @@ function parseSseBlock(block) {
     data: JSON.parse(dataText)
   };
 }
-async function createRunStream(baseUrl, apiKey, request, deadline) {
+async function streamRunRequest(baseUrl, apiKey, path, request, deadline) {
   const timeoutMs = Math.max(deadline - Date.now(), 1);
   const controller = new AbortController();
   const timeoutHandle = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    const response = await fetch(`${baseUrl}/v1/ci/runs`, {
+    const response = await fetch(`${baseUrl}${path}`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${apiKey}`,
@@ -640,11 +711,44 @@ async function createRunStream(baseUrl, apiKey, request, deadline) {
     clearTimeout(timeoutHandle);
   }
 }
+async function createRunStream(baseUrl, apiKey, request, deadline) {
+  return streamRunRequest(baseUrl, apiKey, "/v1/ci/runs", request, deadline);
+}
+async function resumeRunStream(baseUrl, apiKey, taskId, request, deadline) {
+  return streamRunRequest(
+    baseUrl,
+    apiKey,
+    `/v1/tasks/${encodeURIComponent(taskId)}/send-message`,
+    request,
+    deadline
+  );
+}
 async function main(argv = process.argv.slice(2)) {
   const options = parseArgs(argv);
   const detected = detectCiContext();
   const baseUrl = resolveBaseUrl(options);
   const apiKey = resolveApiKey(options);
+  if (options.resumeTaskId) {
+    const taskId = options.resumeTaskId.trim();
+    const request2 = buildResumeMessageRequest(options);
+    if (options.responseMode === "async") {
+      const response = await sendResumeMessage(baseUrl, apiKey, taskId, request2);
+      if (!response.run) {
+        throw new Error("Server did not return CI run metadata for resumed task");
+      }
+      writeAsyncResultFile(options.resultFile, response.run);
+      printStandardFields({
+        runId: response.run.runId,
+        status: response.run.status,
+        detailUrl: response.run.detailUrl
+      });
+      return 0;
+    }
+    const deadline2 = ensureWaitDeadline(options);
+    const finalStatus2 = await resumeRunStream(baseUrl, apiKey, taskId, request2, deadline2);
+    writeResultFile(options.resultFile, finalStatus2);
+    return exitCodeForStatus(finalStatus2.status);
+  }
   const request = buildRequest(options, detected);
   if (options.responseMode === "async") {
     const run = await createRun(baseUrl, apiKey, request);

package/dist/index.mjs

@@ -1,22 +1,26 @@
 import { writeFileSync, readFileSync } from 'node:fs';
-import { CreateCiRunRequestSchema, CiRunStatusResponseSchema, CreateCiRunResponseSchema } from '@agentrix/shared';
+import { CreateCiRunRequestSchema, CiRunStatusResponseSchema, SendTaskMessageResponseSchema, CreateCiRunResponseSchema } from '@agentrix/shared';
 
 const DEFAULT_RESPONSE_MODE = "stream";
 const DEFAULT_WAIT_TIMEOUT_SECONDS = 1800;
 const DEFAULT_AGENTRIX_BASE_URL = "https://agentrix.xmz.ai";
 function usage() {
   return [
-    "Usage: agentrix-run --agent <agent> --prompt <prompt> [options]",
+    "Usage: agentrix-run (--agent <agent> | --resume <task-id>) --prompt <prompt> [options]",
     "",
     "Options:",
     "  --title <text>",
     "  --allow-filesystem-agent",
+    "  --resume <task-id>",
     "  --repo <json>",
     "  --output-schema <json>",
     "  --ref <ref>",
     "  --sha <sha>",
     "  --base-ref <ref>",
     "  --head-ref <ref>",
+    "  --head-sha <sha>",
+    "  --checkout-ref <ref>",
+    "  --checkout-sha <sha>",
     "  --branch-name <name>",
     "  --pr-number <number>",
     "  --issue-number <number>",
@@ -179,6 +183,10 @@ function parseArgs(argv) {
       case "--allow-filesystem-agent":
         options.allowFilesystemAgent = true;
         break;
+      case "--resume":
+        options.resumeTaskId = requireValue(argv, index, arg);
+        index += 1;
+        break;
       case "--title":
         options.title = requireValue(argv, index, arg);
         index += 1;
@@ -211,6 +219,18 @@ function parseArgs(argv) {
         options.headRef = requireValue(argv, index, arg);
         index += 1;
         break;
+      case "--head-sha":
+        options.headSha = requireValue(argv, index, arg);
+        index += 1;
+        break;
+      case "--checkout-ref":
+        options.checkoutRef = requireValue(argv, index, arg);
+        index += 1;
+        break;
+      case "--checkout-sha":
+        options.checkoutSha = requireValue(argv, index, arg);
+        index += 1;
+        break;
       case "--branch-name":
         options.branchName = requireValue(argv, index, arg);
         index += 1;
@@ -266,12 +286,15 @@ function parseArgs(argv) {
         throw new Error(`Unknown argument: ${arg}`);
     }
   }
-  if (!options.agent.trim()) {
+  if (!options.resumeTaskId && !options.agent.trim()) {
     throw new Error("--agent is required");
   }
   if (!options.prompt.trim()) {
     throw new Error("--prompt is required");
   }
+  if (options.resumeTaskId !== void 0 && !options.resumeTaskId.trim()) {
+    throw new Error("--resume must be a non-empty task ID");
+  }
   return options;
 }
 function normalizeRef(value) {
@@ -315,6 +338,15 @@ function optionalPositiveInt(value) {
   const parsed = Number.parseInt(value, 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : void 0;
 }
+function firstEnv(...names) {
+  for (const name of names) {
+    const value = process.env[name];
+    if (value) {
+      return value;
+    }
+  }
+  return void 0;
+}
 function readBooleanEnv(name) {
   const value = process.env[name]?.trim().toLowerCase();
   return value === "1" || value === "true" || value === "yes" || value === "on";
@@ -357,6 +389,7 @@ function detectGithub() {
       sha: process.env.GITHUB_SHA,
       baseRef: process.env.GITHUB_BASE_REF || getNestedString(payload, "pull_request", "base", "ref"),
       headRef: process.env.GITHUB_HEAD_REF || getNestedString(payload, "pull_request", "head", "ref"),
+      headSha: getNestedString(payload, "pull_request", "head", "sha"),
       prNumber: getNestedNumber(payload, "pull_request", "number"),
       issueNumber: getNestedNumber(payload, "issue", "number")
     },
@@ -381,19 +414,24 @@ function detectGitlab() {
       name: repository.name
     },
     git: {
-      ref: process.env.CI_COMMIT_REF_NAME,
-      sha: process.env.CI_COMMIT_SHA,
-      baseRef: process.env.CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
-      headRef: process.env.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME,
-      prNumber: optionalPositiveInt(process.env.CI_MERGE_REQUEST_IID),
-      issueNumber: optionalPositiveInt(process.env.AGENTRIX_ISSUE_NUMBER)
+      ref: firstEnv("GITLAB_BRIDGE_REF_NAME", "CI_COMMIT_REF_NAME"),
+      sha: firstEnv(
+        "GITLAB_BRIDGE_HEAD_SHA",
+        "GITLAB_BRIDGE_WORKFLOW_RUN_SHA",
+        "CI_COMMIT_SHA"
+      ),
+      baseRef: firstEnv("GITLAB_BRIDGE_BASE_REF", "CI_MERGE_REQUEST_TARGET_BRANCH_NAME"),
+      headRef: firstEnv("GITLAB_BRIDGE_HEAD_REF", "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"),
+      headSha: firstEnv("GITLAB_BRIDGE_HEAD_SHA", "CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"),
+      prNumber: optionalPositiveInt(firstEnv("GITLAB_BRIDGE_PR_NUMBER", "CI_MERGE_REQUEST_IID")),
+      issueNumber: optionalPositiveInt(firstEnv("GITLAB_BRIDGE_ISSUE_NUMBER", "AGENTRIX_ISSUE_NUMBER"))
     },
     context: {
       ciProvider: "gitlab_ci",
-      eventName: process.env.AGENTRIX_EVENT_NAME || process.env.CI_PIPELINE_SOURCE,
-      eventAction: process.env.AGENTRIX_EVENT_ACTION,
+      eventName: firstEnv("GITLAB_BRIDGE_EVENT_NAME", "CI_PIPELINE_SOURCE"),
+      eventAction: process.env.GITLAB_BRIDGE_EVENT_ACTION,
       jobUrl: process.env.CI_JOB_URL,
-      runUrl: process.env.CI_PIPELINE_URL
+      runUrl: firstEnv("GITLAB_BRIDGE_WORKFLOW_RUN_URL", "CI_PIPELINE_URL")
     }
   };
 }
@@ -429,6 +467,9 @@ function buildRequest(options, detected) {
       sha: options.sha ?? detected.git?.sha,
       baseRef: options.baseRef ?? detected.git?.baseRef,
       headRef: options.headRef ?? detected.git?.headRef,
+      headSha: options.headSha ?? detected.git?.headSha,
+      checkoutRef: options.checkoutRef ?? detected.git?.checkoutRef,
+      checkoutSha: options.checkoutSha ?? detected.git?.checkoutSha,
       branchName: options.branchName || process.env.AGENTRIX_BRANCH_NAME,
       prNumber: options.prNumber ?? detected.git?.prNumber,
       issueNumber: options.issueNumber ?? detected.git?.issueNumber
@@ -439,10 +480,10 @@ function buildRequest(options, detected) {
     },
     context: detected.context?.ciProvider ? {
       ciProvider: detected.context.ciProvider,
-      eventName: process.env.AGENTRIX_EVENT_NAME || detected.context.eventName,
-      eventAction: process.env.AGENTRIX_EVENT_ACTION || detected.context.eventAction,
+      eventName: detected.context.eventName,
+      eventAction: detected.context.eventAction,
       jobUrl: process.env.AGENTRIX_JOB_URL || detected.context.jobUrl,
-      runUrl: process.env.AGENTRIX_RUN_URL || detected.context.runUrl,
+      runUrl: detected.context.runUrl,
       payload: detected.context.payload
     } : void 0,
     metadata: Object.keys(options.metadata).length > 0 ? options.metadata : void 0
@@ -481,6 +522,36 @@ async function createRun(baseUrl, apiKey, request) {
   const response = await requestJson("POST", `${baseUrl}/v1/ci/runs`, apiKey, request);
   return CreateCiRunResponseSchema.parse(response);
 }
+function createPromptMessage(text) {
+  return {
+    type: "user",
+    message: {
+      role: "user",
+      content: text.trim()
+    },
+    parent_tool_use_id: null,
+    session_id: ""
+  };
+}
+function buildResumeMessageRequest(options) {
+  return {
+    message: createPromptMessage(options.prompt),
+    target: "agent",
+    senderType: "human",
+    senderId: "agentrix-run",
+    senderName: "agentrix-run",
+    responseMode: options.responseMode
+  };
+}
+async function sendResumeMessage(baseUrl, apiKey, taskId, request) {
+  const response = await requestJson(
+    "POST",
+    `${baseUrl}/v1/tasks/${encodeURIComponent(taskId)}/send-message`,
+    apiKey,
+    request
+  );
+  return SendTaskMessageResponseSchema.parse(response);
+}
 function exitCodeForStatus(status) {
   return status === "completed" ? 0 : 1;
 }
@@ -565,12 +636,12 @@ function parseSseBlock(block) {
     data: JSON.parse(dataText)
   };
 }
-async function createRunStream(baseUrl, apiKey, request, deadline) {
+async function streamRunRequest(baseUrl, apiKey, path, request, deadline) {
   const timeoutMs = Math.max(deadline - Date.now(), 1);
   const controller = new AbortController();
   const timeoutHandle = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    const response = await fetch(`${baseUrl}/v1/ci/runs`, {
+    const response = await fetch(`${baseUrl}${path}`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${apiKey}`,
@@ -638,11 +709,44 @@ async function createRunStream(baseUrl, apiKey, request, deadline) {
     clearTimeout(timeoutHandle);
   }
 }
+async function createRunStream(baseUrl, apiKey, request, deadline) {
+  return streamRunRequest(baseUrl, apiKey, "/v1/ci/runs", request, deadline);
+}
+async function resumeRunStream(baseUrl, apiKey, taskId, request, deadline) {
+  return streamRunRequest(
+    baseUrl,
+    apiKey,
+    `/v1/tasks/${encodeURIComponent(taskId)}/send-message`,
+    request,
+    deadline
+  );
+}
 async function main(argv = process.argv.slice(2)) {
   const options = parseArgs(argv);
   const detected = detectCiContext();
   const baseUrl = resolveBaseUrl(options);
   const apiKey = resolveApiKey(options);
+  if (options.resumeTaskId) {
+    const taskId = options.resumeTaskId.trim();
+    const request2 = buildResumeMessageRequest(options);
+    if (options.responseMode === "async") {
+      const response = await sendResumeMessage(baseUrl, apiKey, taskId, request2);
+      if (!response.run) {
+        throw new Error("Server did not return CI run metadata for resumed task");
+      }
+      writeAsyncResultFile(options.resultFile, response.run);
+      printStandardFields({
+        runId: response.run.runId,
+        status: response.run.status,
+        detailUrl: response.run.detailUrl
+      });
+      return 0;
+    }
+    const deadline2 = ensureWaitDeadline(options);
+    const finalStatus2 = await resumeRunStream(baseUrl, apiKey, taskId, request2, deadline2);
+    writeResultFile(options.resultFile, finalStatus2);
+    return exitCodeForStatus(finalStatus2.status);
+  }
   const request = buildRequest(options, detected);
   if (options.responseMode === "async") {
     const run = await createRun(baseUrl, apiKey, request);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentrix/agentrix-run",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Native CI submit-and-observe wrapper for Agentrix",
   "type": "module",
   "bin": {
@@ -32,7 +32,7 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@agentrix/shared": "^2.33.0"
+    "@agentrix/shared": "^2.41.0"
   },
   "devDependencies": {
     "@types/node": ">=20",