@locusai/cli 0.16.1 → 0.16.2

package/bin/agent/worker.js

@@ -13949,7 +13949,7 @@ var init_constants = __esm(() => {
 });
 
 // ../shared/src/enums.ts
-var UserRole, MembershipRole, TaskStatus, TaskPriority, AssigneeRole, SprintStatus, InstanceStatus, AwsRegion, EventType;
+var UserRole, MembershipRole, TaskStatus, TaskPriority, AssigneeRole, SprintStatus, EventType;
 var init_enums = __esm(() => {
   ((UserRole2) => {
     UserRole2["USER"] = "USER";
@@ -13986,16 +13986,6 @@ var init_enums = __esm(() => {
     SprintStatus2["ACTIVE"] = "ACTIVE";
     SprintStatus2["COMPLETED"] = "COMPLETED";
   })(SprintStatus ||= {});
-  ((InstanceStatus2) => {
-    InstanceStatus2["PROVISIONING"] = "PROVISIONING";
-    InstanceStatus2["RUNNING"] = "RUNNING";
-    InstanceStatus2["STOPPED"] = "STOPPED";
-    InstanceStatus2["TERMINATED"] = "TERMINATED";
-    InstanceStatus2["ERROR"] = "ERROR";
-  })(InstanceStatus ||= {});
-  ((AwsRegion2) => {
-    AwsRegion2["US_EAST_1"] = "us-east-1";
-  })(AwsRegion ||= {});
   ((EventType2) => {
     EventType2["TASK_CREATED"] = "TASK_CREATED";
     EventType2["TASK_UPDATED"] = "TASK_UPDATED";
@@ -14343,76 +14333,6 @@ var init_auth = __esm(() => {
   });
 });
 
-// ../shared/src/models/aws-instance.ts
-var InstanceAction, AwsCredentialsSchema, IntegrationSchema, AwsInstanceSchema, CreateAwsInstanceSchema, UpdateAwsInstanceSchema, SaveAwsCredentialsSchema, ProvisionAwsInstanceSchema, InstanceActionBodySchema, InstanceIdParamSchema, CIDR_REGEX, UpdateSecurityRulesSchema;
-var init_aws_instance = __esm(() => {
-  init_zod();
-  init_common();
-  init_enums();
-  ((InstanceAction2) => {
-    InstanceAction2["START"] = "START";
-    InstanceAction2["STOP"] = "STOP";
-    InstanceAction2["TERMINATE"] = "TERMINATE";
-  })(InstanceAction ||= {});
-  AwsCredentialsSchema = exports_external.object({
-    accessKeyId: exports_external.string().min(1),
-    secretAccessKey: exports_external.string().min(1),
-    region: exports_external.enum(AwsRegion).default("us-east-1" /* US_EAST_1 */)
-  });
-  IntegrationSchema = exports_external.object({
-    name: exports_external.string(),
-    config: exports_external.record(exports_external.string(), exports_external.string())
-  });
-  AwsInstanceSchema = BaseEntitySchema.extend({
-    workspaceId: exports_external.uuid(),
-    instanceId: exports_external.string(),
-    status: exports_external.enum(InstanceStatus),
-    instanceType: exports_external.enum(["t3.micro", "t3.small", "t3.medium"]),
-    region: exports_external.enum(AwsRegion).default("us-east-1" /* US_EAST_1 */),
-    publicIp: exports_external.string().nullable().optional(),
-    launchTime: exports_external.union([exports_external.date(), exports_external.number()]).nullable().optional(),
-    repoUrl: exports_external.string().nullable().optional(),
-    integrations: exports_external.array(IntegrationSchema).default([])
-  });
-  CreateAwsInstanceSchema = exports_external.object({
-    workspaceId: exports_external.uuid(),
-    instanceType: exports_external.enum(["t3.micro", "t3.small", "t3.medium"]).default("t3.micro"),
-    region: exports_external.enum(AwsRegion).default("us-east-1" /* US_EAST_1 */),
-    repoUrl: exports_external.string().optional(),
-    integrations: exports_external.array(IntegrationSchema).optional().default([])
-  });
-  UpdateAwsInstanceSchema = exports_external.object({
-    status: exports_external.enum(InstanceStatus).optional(),
-    instanceType: exports_external.enum(["t3.micro", "t3.small", "t3.medium"]).optional(),
-    publicIp: exports_external.string().nullable().optional(),
-    launchTime: exports_external.union([exports_external.date(), exports_external.number()]).nullable().optional(),
-    repoUrl: exports_external.string().nullable().optional(),
-    integrations: exports_external.array(IntegrationSchema).optional()
-  });
-  SaveAwsCredentialsSchema = exports_external.object({
-    accessKeyId: exports_external.string().min(16),
-    secretAccessKey: exports_external.string().min(1),
-    region: exports_external.string().default("us-east-1")
-  });
-  ProvisionAwsInstanceSchema = exports_external.object({
-    repoUrl: exports_external.string().min(1),
-    githubToken: exports_external.string().min(1),
-    instanceType: exports_external.enum(["t3.micro", "t3.small", "t3.medium"]).default("t3.small"),
-    integrations: exports_external.array(IntegrationSchema).optional().default([])
-  });
-  InstanceActionBodySchema = exports_external.object({
-    action: exports_external.nativeEnum(InstanceAction)
-  });
-  InstanceIdParamSchema = exports_external.object({
-    workspaceId: exports_external.string().uuid("Invalid Workspace ID"),
-    instanceId: exports_external.string().uuid("Invalid Instance ID")
-  });
-  CIDR_REGEX = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d{1,2}$/;
-  UpdateSecurityRulesSchema = exports_external.object({
-    allowedIps: exports_external.array(exports_external.string().regex(CIDR_REGEX, "Invalid CIDR format (e.g. 1.2.3.4/32)"))
-  });
-});
-
 // ../shared/src/models/ci.ts
 var RecordCiSchema;
 var init_ci = __esm(() => {
@@ -14800,7 +14720,6 @@ var init_models = __esm(() => {
   init_activity();
   init_agent();
   init_auth();
-  init_aws_instance();
   init_ci();
   init_doc();
   init_doc_group();
@@ -15560,6 +15479,112 @@ var init_resolve_bin = __esm(() => {
   ENV_VARS_TO_STRIP = ["ANTHROPIC_API_KEY", "OPENAI_API_KEY"];
 });
 
+// ../sdk/src/ai/claude-stream-parser.ts
+class ClaudeStreamParser {
+  activeTools = new Map;
+  parseLineToChunk(line) {
+    if (!line.trim())
+      return null;
+    try {
+      const item = JSON.parse(line);
+      return this.processItemToChunk(item);
+    } catch {
+      return null;
+    }
+  }
+  parseLine(line, log) {
+    if (!line.trim())
+      return null;
+    try {
+      const item = JSON.parse(line);
+      return this.processItem(item, log);
+    } catch {
+      return null;
+    }
+  }
+  processItemToChunk(item) {
+    if (item.type === "result") {
+      return { type: "result", content: item.result || "" };
+    }
+    if (item.type === "stream_event" && item.event) {
+      return this.handleEventToChunk(item.event);
+    }
+    return null;
+  }
+  handleEventToChunk(event) {
+    const { type, delta, content_block, index } = event;
+    if (type === "content_block_delta" && delta?.type === "text_delta") {
+      return { type: "text_delta", content: delta.text || "" };
+    }
+    if (type === "content_block_delta" && delta?.type === "input_json_delta" && delta.partial_json !== undefined && index !== undefined) {
+      const activeTool = this.activeTools.get(index);
+      if (activeTool) {
+        activeTool.parameterJson += delta.partial_json;
+      }
+      return null;
+    }
+    if (type === "content_block_start" && content_block) {
+      if (content_block.type === "tool_use" && content_block.name) {
+        if (index !== undefined) {
+          this.activeTools.set(index, {
+            name: content_block.name,
+            id: content_block.id,
+            index,
+            parameterJson: "",
+            startTime: Date.now()
+          });
+        }
+        return {
+          type: "tool_use",
+          tool: content_block.name,
+          id: content_block.id
+        };
+      }
+      if (content_block.type === "thinking") {
+        return { type: "thinking" };
+      }
+    }
+    if (type === "content_block_stop" && index !== undefined) {
+      const activeTool = this.activeTools.get(index);
+      if (activeTool?.parameterJson) {
+        try {
+          const parameters = JSON.parse(activeTool.parameterJson);
+          return {
+            type: "tool_parameters",
+            tool: activeTool.name,
+            id: activeTool.id,
+            parameters
+          };
+        } catch {}
+      }
+      return null;
+    }
+    return null;
+  }
+  processItem(item, log) {
+    if (item.type === "result") {
+      return item.result || "";
+    }
+    if (item.type === "stream_event" && item.event) {
+      this.handleEvent(item.event, log);
+    }
+    return null;
+  }
+  handleEvent(event, log) {
+    const { type, content_block } = event;
+    if (type === "content_block_start" && content_block) {
+      if (content_block.type === "tool_use" && content_block.name) {
+        log?.(`
+${c.primary("[Claude]")} ${c.bold(`Running ${content_block.name}...`)}
+`, "info");
+      }
+    }
+  }
+}
+var init_claude_stream_parser = __esm(() => {
+  init_colors();
+});
+
 // ../sdk/src/ai/claude-runner.ts
 import { spawn } from "node:child_process";
 import { resolve } from "node:path";
@@ -15570,7 +15595,6 @@ class ClaudeRunner {
   projectPath;
   eventEmitter;
   currentToolName;
-  activeTools = new Map;
   activeProcess = null;
   aborted = false;
   timeoutMs;
@@ -15605,7 +15629,7 @@ class ClaudeRunner {
         }
         if (!isLastAttempt) {
           const delay = Math.pow(2, attempt) * 1000;
-          console.warn(`Claude CLI attempt ${attempt} failed: ${err.message}. Retrying in ${delay}ms...`);
+          this.log?.(`Claude CLI attempt ${attempt} failed: ${err.message}. Retrying in ${delay}ms...`, "warn");
           await new Promise((resolve2) => setTimeout(resolve2, delay));
         }
       }
@@ -15645,6 +15669,7 @@ class ClaudeRunner {
   }
   async* runStream(prompt) {
     this.aborted = false;
+    const parser = new ClaudeStreamParser;
     const args = this.buildCliArgs();
     const env = getAugmentedEnv({
       FORCE_COLOR: "1",
@@ -15705,7 +15730,7 @@ class ClaudeRunner {
 `);
       buffer = lines.pop() || "";
       for (const line of lines) {
-        const chunk = this.parseStreamLineToChunk(line);
+        const chunk = parser.parseLineToChunk(line);
         if (chunk) {
           if (chunk.type === "result") {
             lastResultContent = chunk.content;
@@ -15814,77 +15839,9 @@ class ClaudeRunner {
         break;
     }
   }
-  parseStreamLineToChunk(line) {
-    if (!line.trim())
-      return null;
-    try {
-      const item = JSON.parse(line);
-      return this.processStreamItemToChunk(item);
-    } catch {
-      return null;
-    }
-  }
-  processStreamItemToChunk(item) {
-    if (item.type === "result") {
-      return { type: "result", content: item.result || "" };
-    }
-    if (item.type === "stream_event" && item.event) {
-      return this.handleEventToChunk(item.event);
-    }
-    return null;
-  }
-  handleEventToChunk(event) {
-    const { type, delta, content_block, index } = event;
-    if (type === "content_block_delta" && delta?.type === "text_delta") {
-      return { type: "text_delta", content: delta.text || "" };
-    }
-    if (type === "content_block_delta" && delta?.type === "input_json_delta" && delta.partial_json !== undefined && index !== undefined) {
-      const activeTool = this.activeTools.get(index);
-      if (activeTool) {
-        activeTool.parameterJson += delta.partial_json;
-      }
-      return null;
-    }
-    if (type === "content_block_start" && content_block) {
-      if (content_block.type === "tool_use" && content_block.name) {
-        if (index !== undefined) {
-          this.activeTools.set(index, {
-            name: content_block.name,
-            id: content_block.id,
-            index,
-            parameterJson: "",
-            startTime: Date.now()
-          });
-        }
-        return {
-          type: "tool_use",
-          tool: content_block.name,
-          id: content_block.id
-        };
-      }
-      if (content_block.type === "thinking") {
-        return { type: "thinking" };
-      }
-    }
-    if (type === "content_block_stop" && index !== undefined) {
-      const activeTool = this.activeTools.get(index);
-      if (activeTool?.parameterJson) {
-        try {
-          const parameters = JSON.parse(activeTool.parameterJson);
-          return {
-            type: "tool_parameters",
-            tool: activeTool.name,
-            id: activeTool.id,
-            parameters
-          };
-        } catch {}
-      }
-      return null;
-    }
-    return null;
-  }
   executeRun(prompt) {
     this.aborted = false;
+    const parser = new ClaudeStreamParser;
     return new Promise((resolve2, reject) => {
       const args = this.buildCliArgs();
       const env = getAugmentedEnv({
@@ -15907,7 +15864,7 @@ class ClaudeRunner {
 `);
         buffer = lines.pop() || "";
         for (const line of lines) {
-          const result = this.handleStreamLine(line);
+          const result = parser.parseLine(line, this.log);
           if (result)
             finalResult = result;
         }
@@ -15948,35 +15905,6 @@ class ClaudeRunner {
       claude.stdin.end();
     });
   }
-  handleStreamLine(line) {
-    if (!line.trim())
-      return null;
-    try {
-      const item = JSON.parse(line);
-      return this.processStreamItem(item);
-    } catch {
-      return null;
-    }
-  }
-  processStreamItem(item) {
-    if (item.type === "result") {
-      return item.result || "";
-    }
-    if (item.type === "stream_event" && item.event) {
-      this.handleEvent(item.event);
-    }
-    return null;
-  }
-  handleEvent(event) {
-    const { type, content_block } = event;
-    if (type === "content_block_start" && content_block) {
-      if (content_block.type === "tool_use" && content_block.name) {
-        this.log?.(`
-${c.primary("[Claude]")} ${c.bold(`Running ${content_block.name}...`)}
-`, "info");
-      }
-    }
-  }
   shouldSuppressLine(line) {
     const infoLogRegex = /^\[\d{2}:\d{2}:\d{2}\]\s\[.*?\]\sℹ\s*$/;
     return infoLogRegex.test(line.trim());
@@ -15990,8 +15918,8 @@ ${c.primary("[Claude]")} ${c.bold(`Running ${content_block.name}...`)}
 var DEFAULT_TIMEOUT_MS;
 var init_claude_runner = __esm(() => {
   init_config();
-  init_colors();
   init_resolve_bin();
+  init_claude_stream_parser();
   DEFAULT_TIMEOUT_MS = 60 * 60 * 1000;
 });
 
@@ -16043,7 +15971,7 @@ class CodexRunner {
         }
         if (attempt < maxRetries) {
           const delay = Math.pow(2, attempt) * 1000;
-          console.warn(`Codex CLI attempt ${attempt} failed: ${lastError.message}. Retrying in ${delay}ms...`);
+          this.log?.(`Codex CLI attempt ${attempt} failed: ${lastError.message}. Retrying in ${delay}ms...`, "warn");
           await this.sleep(delay);
         }
       }
@@ -16335,6 +16263,20 @@ var init_codex_runner = __esm(() => {
 });
 
 // ../sdk/src/ai/factory.ts
+function createWorkerLogger(agentId, prefix) {
+  const tag = prefix ? `${prefix}:${agentId.slice(-8)}` : agentId.slice(-8);
+  return (message, level = "info") => {
+    const timestamp = new Date().toISOString().split("T")[1]?.slice(0, 8) ?? "";
+    const colorFn = {
+      info: c.cyan,
+      success: c.green,
+      warn: c.yellow,
+      error: c.red
+    }[level];
+    const icon = { info: "ℹ", success: "✓", warn: "⚠", error: "✗" }[level];
+    console.log(`${c.dim(`[${timestamp}]`)} ${c.bold(`[${tag}]`)} ${colorFn(`${icon} ${message}`)}`);
+  };
+}
 function createAiRunner(provider, config2) {
   const resolvedProvider = provider ?? PROVIDER.CLAUDE;
   const model = config2.model ?? DEFAULT_MODEL[resolvedProvider];
@@ -16351,6 +16293,7 @@ function createAiRunner(provider, config2) {
 }
 var init_factory = __esm(() => {
   init_config();
+  init_colors();
   init_claude_runner();
   init_codex_runner();
 });
@@ -31554,49 +31497,6 @@ var init_docs = __esm(() => {
   };
 });
 
-// ../sdk/src/modules/instances.ts
-var InstancesModule;
-var init_instances = __esm(() => {
-  InstancesModule = class InstancesModule extends BaseModule {
-    async list(workspaceId) {
-      const { data } = await this.api.get(`/workspaces/${workspaceId}/aws-instances`);
-      return data.instances;
-    }
-    async get(workspaceId, instanceId) {
-      const { data } = await this.api.get(`/workspaces/${workspaceId}/aws-instances/${instanceId}`);
-      return data.instance;
-    }
-    async provision(workspaceId, body) {
-      const { data } = await this.api.post(`/workspaces/${workspaceId}/aws-instances`, body);
-      return data.instance;
-    }
-    async performAction(workspaceId, instanceId, action) {
-      const { data } = await this.api.post(`/workspaces/${workspaceId}/aws-instances/${instanceId}/actions`, { action });
-      return data.instance;
-    }
-    async sync(workspaceId, instanceId) {
-      const { data } = await this.api.post(`/workspaces/${workspaceId}/aws-instances/${instanceId}/sync`);
-      return data.instance;
-    }
-    async checkUpdates(workspaceId, instanceId) {
-      const { data } = await this.api.get(`/workspaces/${workspaceId}/aws-instances/${instanceId}/updates`);
-      return data.update;
-    }
-    async applyUpdate(workspaceId, instanceId) {
-      const { data } = await this.api.post(`/workspaces/${workspaceId}/aws-instances/${instanceId}/updates`);
-      return data.update;
-    }
-    async getSecurity(workspaceId, instanceId) {
-      const { data } = await this.api.get(`/workspaces/${workspaceId}/aws-instances/${instanceId}/security`);
-      return data.rules;
-    }
-    async updateSecurity(workspaceId, instanceId, body) {
-      const { data } = await this.api.put(`/workspaces/${workspaceId}/aws-instances/${instanceId}/security`, body);
-      return data.rules;
-    }
-  };
-});
-
 // ../sdk/src/modules/invitations.ts
 var InvitationsModule;
 var init_invitations = __esm(() => {
@@ -31829,17 +31729,6 @@ var init_workspaces = __esm(() => {
     async deleteApiKey(workspaceId, keyId) {
       await this.api.delete(`/workspaces/${workspaceId}/api-keys/${keyId}`);
     }
-    async getAwsCredentials(workspaceId) {
-      const { data } = await this.api.get(`/workspaces/${workspaceId}/aws-credentials`);
-      return data.credential;
-    }
-    async saveAwsCredentials(workspaceId, body) {
-      const { data } = await this.api.put(`/workspaces/${workspaceId}/aws-credentials`, body);
-      return data.credential;
-    }
-    async deleteAwsCredentials(workspaceId) {
-      await this.api.delete(`/workspaces/${workspaceId}/aws-credentials`);
-    }
   };
 });
 
@@ -31888,7 +31777,6 @@ class LocusClient {
   invitations;
   docs;
   ci;
-  instances;
   constructor(config2) {
     this.emitter = new LocusEmitter;
     this.api = axios_default.create({
@@ -31908,7 +31796,6 @@ class LocusClient {
     this.invitations = new InvitationsModule(this.api, this.emitter);
     this.docs = new DocsModule(this.api, this.emitter);
     this.ci = new CiModule(this.api, this.emitter);
-    this.instances = new InstancesModule(this.api, this.emitter);
     if (config2.retryOptions) {
       this.setupRetryInterceptor(config2.retryOptions);
     }
@@ -31974,7 +31861,6 @@ var init_src2 = __esm(() => {
   init_auth2();
   init_ci2();
   init_docs();
-  init_instances();
   init_invitations();
   init_organizations();
   init_sprints();
@@ -31985,7 +31871,6 @@ var init_src2 = __esm(() => {
   init_auth2();
   init_ci2();
   init_docs();
-  init_instances();
   init_invitations();
   init_organizations();
   init_sprints();
@@ -32826,9 +32711,11 @@ class AgentWorker {
   currentTaskId = null;
   completedTaskList = [];
   taskSummaries = [];
+  log;
   constructor(config2) {
     this.config = config2;
     const projectPath = config2.projectPath || process.cwd();
+    this.log = createWorkerLogger(config2.agentId);
     this.client = new LocusClient({
       baseUrl: config2.apiBase,
       token: config2.apiKey,
@@ -32839,7 +32726,6 @@ class AgentWorker {
         factor: 2
       }
     });
-    const log = this.log.bind(this);
     if (!isGitAvailable()) {
       this.log("git is not installed — branch management will not work", "error");
     }
@@ -32850,29 +32736,18 @@ class AgentWorker {
     this.aiRunner = createAiRunner(provider, {
       projectPath,
       model: config2.model,
-      log,
+      log: this.log,
       reasoningEffort: config2.reasoningEffort
     });
     this.taskExecutor = new TaskExecutor({
       aiRunner: this.aiRunner,
       projectPath,
-      log
+      log: this.log
     });
-    this.gitWorkflow = new GitWorkflow(config2, log);
+    this.gitWorkflow = new GitWorkflow(config2, this.log);
     const providerLabel = provider === "codex" ? "Codex" : "Claude";
     this.log(`Using ${providerLabel} CLI for all phases`, "info");
   }
-  log(message, level = "info") {
-    const timestamp = new Date().toISOString().split("T")[1]?.slice(0, 8) ?? "";
-    const colorFn = {
-      info: c.cyan,
-      success: c.green,
-      warn: c.yellow,
-      error: c.red
-    }[level];
-    const prefix = { info: "ℹ", success: "✓", warn: "⚠", error: "✗" }[level];
-    console.log(`${c.dim(`[${timestamp}]`)} ${c.bold(`[${this.config.agentId.slice(-8)}]`)} ${colorFn(`${prefix} ${message}`)}`);
-  }
   async getActiveSprint() {
     try {
       if (this.config.sprintId) {
@@ -33049,7 +32924,6 @@ var init_worker = __esm(() => {
   init_config();
   init_git_utils();
   init_src2();
-  init_colors();
   init_git_workflow();
   init_task_executor();
   workerEntrypoint = process.argv[1]?.split(/[\\/]/).pop();