@agentrix/agentrix-run 0.5.0 → 0.7.0

package/dist/index.cjs

@@ -5,13 +5,15 @@ var shared = require('@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>",
@@ -26,7 +28,7 @@ function usage() {
     "  --capability-profile <name>",
     "  --runner-id <cloud-id|machine-id>",
     "  --result-file <path>",
-    "  --base-url <url>",
+    `  --base-url <url> (default: ${DEFAULT_AGENTRIX_BASE_URL})`,
     "  --api-key <api-key>",
     "  --metadata <key=value>",
     "  --help"
@@ -180,6 +182,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;
@@ -267,12 +273,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) {
@@ -451,10 +460,7 @@ function buildRequest(options, detected) {
   return shared.CreateCiRunRequestSchema.parse(request);
 }
 function resolveBaseUrl(options) {
-  const value = options.baseUrl || process.env.AGENTRIX_BASE_URL;
-  if (!value) {
-    throw new Error("Missing --base-url and AGENTRIX_BASE_URL");
-  }
+  const value = options.baseUrl || process.env.AGENTRIX_BASE_URL || DEFAULT_AGENTRIX_BASE_URL;
   return value.replace(/\/+$/, "");
 }
 function resolveApiKey(options) {
@@ -485,6 +491,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;
 }
@@ -569,12 +605,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}`,
@@ -642,11 +678,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,15 +1,17 @@
 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>",
@@ -24,7 +26,7 @@ function usage() {
     "  --capability-profile <name>",
     "  --runner-id <cloud-id|machine-id>",
     "  --result-file <path>",
-    "  --base-url <url>",
+    `  --base-url <url> (default: ${DEFAULT_AGENTRIX_BASE_URL})`,
     "  --api-key <api-key>",
     "  --metadata <key=value>",
     "  --help"
@@ -178,6 +180,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;
@@ -265,12 +271,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) {
@@ -449,10 +458,7 @@ function buildRequest(options, detected) {
   return CreateCiRunRequestSchema.parse(request);
 }
 function resolveBaseUrl(options) {
-  const value = options.baseUrl || process.env.AGENTRIX_BASE_URL;
-  if (!value) {
-    throw new Error("Missing --base-url and AGENTRIX_BASE_URL");
-  }
+  const value = options.baseUrl || process.env.AGENTRIX_BASE_URL || DEFAULT_AGENTRIX_BASE_URL;
   return value.replace(/\/+$/, "");
 }
 function resolveApiKey(options) {
@@ -483,6 +489,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;
 }
@@ -567,12 +603,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 +676,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.5.0",
+  "version": "0.7.0",
   "description": "Native CI submit-and-observe wrapper for Agentrix",
   "type": "module",
   "bin": {
@@ -32,7 +32,7 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@agentrix/shared": "^2.32.0"
+    "@agentrix/shared": "^2.40.0"
   },
   "devDependencies": {
     "@types/node": ">=20",