@locusai/cli 0.16.1 → 0.16.2

package/bin/locus.js

@@ -7065,6 +7065,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";
@@ -7075,7 +7181,6 @@ class ClaudeRunner {
   projectPath;
   eventEmitter;
   currentToolName;
-  activeTools = new Map;
   activeProcess = null;
   aborted = false;
   timeoutMs;
@@ -7110,7 +7215,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));
         }
       }
@@ -7150,6 +7255,7 @@ class ClaudeRunner {
   }
   async* runStream(prompt) {
     this.aborted = false;
+    const parser = new ClaudeStreamParser;
     const args = this.buildCliArgs();
     const env = getAugmentedEnv({
       FORCE_COLOR: "1",
@@ -7210,7 +7316,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;
@@ -7319,77 +7425,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({
@@ -7412,7 +7450,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;
         }
@@ -7453,35 +7491,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());
@@ -7495,8 +7504,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;
 });
 
@@ -7548,7 +7557,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);
         }
       }
@@ -7840,6 +7849,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, config) {
   const resolvedProvider = provider ?? PROVIDER.CLAUDE;
   const model = config.model ?? DEFAULT_MODEL[resolvedProvider];
@@ -7854,8 +7877,10 @@ function createAiRunner(provider, config) {
       return new ClaudeRunner(config.projectPath, model, config.log, config.timeoutMs);
   }
 }
+var noopLogger = () => {};
 var init_factory = __esm(() => {
   init_config();
+  init_colors();
   init_claude_runner();
   init_codex_runner();
 });
@@ -23201,49 +23226,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(() => {
@@ -37273,7 +37255,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";
@@ -37310,16 +37292,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";
@@ -37667,76 +37639,6 @@ var init_auth2 = __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_ci2 = __esm(() => {
@@ -38124,7 +38026,6 @@ var init_models = __esm(() => {
   init_activity();
   init_agent();
   init_auth2();
-  init_aws_instance();
   init_ci2();
   init_doc();
   init_doc_group();
@@ -38793,17 +38694,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`);
-    }
   };
 });
 
@@ -38852,7 +38742,6 @@ class LocusClient {
   invitations;
   docs;
   ci;
-  instances;
   constructor(config2) {
     this.emitter = new LocusEmitter;
     this.api = axios_default.create({
@@ -38872,7 +38761,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);
     }
@@ -38938,7 +38826,6 @@ var init_src2 = __esm(() => {
   init_auth();
   init_ci();
   init_docs();
-  init_instances();
   init_invitations();
   init_organizations();
   init_sprints();
@@ -38949,7 +38836,6 @@ var init_src2 = __esm(() => {
   init_auth();
   init_ci();
   init_docs();
-  init_instances();
   init_invitations();
   init_organizations();
   init_sprints();
@@ -38975,9 +38861,11 @@ class ReviewerWorker {
   currentTaskId = null;
   maxReviews = 50;
   reviewsCompleted = 0;
+  log;
   constructor(config2) {
     this.config = config2;
     const projectPath = config2.projectPath || process.cwd();
+    this.log = createWorkerLogger(config2.agentId, "R");
     this.client = new LocusClient({
       baseUrl: config2.apiBase,
       token: config2.apiKey,
@@ -38988,28 +38876,16 @@ class ReviewerWorker {
         factor: 2
       }
     });
-    const log = this.log.bind(this);
     const provider = config2.provider ?? PROVIDER.CLAUDE;
     this.aiRunner = createAiRunner(provider, {
       projectPath,
       model: config2.model,
-      log
+      log: this.log
     });
-    this.prService = new PrService(projectPath, log);
+    this.prService = new PrService(projectPath, this.log);
     const providerLabel = provider === "codex" ? "Codex" : "Claude";
     this.log(`Reviewer agent using ${providerLabel} CLI`, "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(`[R:${this.config.agentId.slice(-8)}]`)} ${colorFn(`${prefix} ${message}`)}`);
-  }
   getNextUnreviewedPr() {
     const prs = this.prService.listUnreviewedLocusPrs();
     return prs.length > 0 ? prs[0] : null;
@@ -39129,7 +39005,6 @@ var init_reviewer_worker = __esm(() => {
   init_git_utils();
   init_pr_service();
   init_src2();
-  init_colors();
   reviewerEntrypoint = process.argv[1]?.split(/[\\/]/).pop();
   if (reviewerEntrypoint === "reviewer-worker.js" || reviewerEntrypoint === "reviewer-worker.ts") {
     process.title = "locus-reviewer";
@@ -39758,9 +39633,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,
@@ -39771,7 +39648,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");
     }
@@ -39782,29 +39658,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) {
@@ -39981,7 +39846,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();
@@ -40012,6 +39876,7 @@ var init_agent2 = __esm(() => {
 // ../sdk/src/ai/index.ts
 var init_ai = __esm(() => {
   init_claude_runner();
+  init_claude_stream_parser();
   init_codex_runner();
   init_factory();
 });
@@ -40183,9 +40048,7 @@ class DiscussionFacilitator {
     this.projectPath = config2.projectPath;
     this.aiRunner = config2.aiRunner;
     this.discussionManager = config2.discussionManager;
-    this.log = config2.log ?? ((_msg) => {
-      return;
-    });
+    this.log = config2.log ?? noopLogger;
     this.provider = config2.provider;
     this.model = config2.model;
   }
@@ -40356,6 +40219,7 @@ If you need more information about the project strategies, plans, or architectur
   }
 }
 var init_discussion_facilitator = __esm(() => {
+  init_factory();
   init_config();
 });
 
@@ -41843,9 +41707,7 @@ class PlanningMeeting {
   constructor(config2) {
     this.projectPath = config2.projectPath;
     this.aiRunner = config2.aiRunner;
-    this.log = config2.log ?? ((_msg) => {
-      return;
-    });
+    this.log = config2.log ?? noopLogger;
   }
   async run(directive, feedback) {
     this.log("Planning sprint...", "info");
@@ -41885,6 +41747,7 @@ class PlanningMeeting {
   }
 }
 var init_planning_meeting = __esm(() => {
+  init_factory();
   init_config();
 });
 
@@ -41911,24 +41774,313 @@ var init_index_node = __esm(() => {
   init_planning();
 });
 
+// ../commands/src/config.ts
+import { existsSync as existsSync12 } from "node:fs";
+import { join as join12 } from "node:path";
+function isProjectInitialized(projectPath) {
+  const locusDir = join12(projectPath, LOCUS_CONFIG.dir);
+  const configPath = join12(locusDir, LOCUS_CONFIG.configFile);
+  return existsSync12(locusDir) && existsSync12(configPath);
+}
+function resolveProvider3(input) {
+  if (!input)
+    return PROVIDER.CLAUDE;
+  if (input === PROVIDER.CLAUDE || input === PROVIDER.CODEX)
+    return input;
+  throw new Error(`Invalid provider '${input}'. Must be 'claude' or 'codex'.`);
+}
+function maskSecret(value) {
+  if (value.length <= 8)
+    return "****";
+  return `${value.slice(0, 4)}...${value.slice(-4)}`;
+}
+var init_config2 = __esm(() => {
+  init_index_node();
+});
+
+// ../commands/src/settings.ts
+import { existsSync as existsSync13, readFileSync as readFileSync11, unlinkSync as unlinkSync4, writeFileSync as writeFileSync6 } from "node:fs";
+import { join as join13 } from "node:path";
+function getSettingsPath(projectPath) {
+  return join13(projectPath, LOCUS_CONFIG.dir, LOCUS_CONFIG.settingsFile);
+}
+
+class SettingsManager {
+  projectPath;
+  constructor(projectPath) {
+    this.projectPath = projectPath;
+  }
+  load() {
+    const settingsPath = getSettingsPath(this.projectPath);
+    if (!existsSync13(settingsPath)) {
+      return {};
+    }
+    return JSON.parse(readFileSync11(settingsPath, "utf-8"));
+  }
+  save(settings) {
+    const { $schema: _2, ...rest } = settings;
+    const ordered = { $schema: LOCUS_SCHEMAS.settings, ...rest };
+    const settingsPath = getSettingsPath(this.projectPath);
+    writeFileSync6(settingsPath, JSON.stringify(ordered, null, 2), "utf-8");
+  }
+  get(key) {
+    return this.load()[key];
+  }
+  set(key, value) {
+    const settings = this.load();
+    settings[key] = value;
+    this.save(settings);
+  }
+  remove() {
+    const settingsPath = getSettingsPath(this.projectPath);
+    if (existsSync13(settingsPath)) {
+      unlinkSync4(settingsPath);
+    }
+  }
+  exists() {
+    return existsSync13(getSettingsPath(this.projectPath));
+  }
+}
+var init_settings = __esm(() => {
+  init_index_node();
+});
+
+// ../commands/src/logger.ts
+function createCliLogger() {
+  return (message, level) => {
+    const icon = level === "success" ? c.success("✔") : level === "error" ? c.error("✖") : level === "warn" ? c.warning("!") : c.info("●");
+    console.log(`  ${icon} ${message}`);
+  };
+}
+var init_logger = __esm(() => {
+  init_index_node();
+  init_index_node();
+});
+
+// ../commands/src/workspace.ts
+class WorkspaceResolver {
+  options;
+  constructor(options) {
+    this.options = options;
+  }
+  async resolve() {
+    if (this.options.workspaceId) {
+      return this.options.workspaceId;
+    }
+    const log = this.options.log ?? noopLogger;
+    try {
+      log("Resolving workspace from API key...");
+      const client = new LocusClient({
+        baseUrl: this.options.apiBase,
+        token: this.options.apiKey
+      });
+      const info = await client.auth.getApiKeyInfo();
+      if (info.workspaceId) {
+        log(`Resolved workspace: ${info.workspaceId}`);
+        return info.workspaceId;
+      }
+      throw new Error("API key is not associated with a workspace. Please specify a workspace ID.");
+    } catch (error48) {
+      if (error48 instanceof Error && error48.message.includes("API key is not")) {
+        throw error48;
+      }
+      throw new Error(`Error resolving workspace: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    }
+  }
+}
+var init_workspace2 = __esm(() => {
+  init_src2();
+  init_logger();
+});
+
+// ../commands/src/api-context.ts
+async function resolveApiContext(options) {
+  const settings = new SettingsManager(options.projectPath).load();
+  const apiKey = options.apiKey || settings.apiKey;
+  if (!apiKey) {
+    throw new Error("API key is required. Configure with: locus config setup --api-key <key>");
+  }
+  const apiBase = options.apiUrl || settings.apiUrl || DEFAULT_API_BASE;
+  const resolver = new WorkspaceResolver({
+    apiKey,
+    apiBase,
+    workspaceId: options.workspaceId
+  });
+  const workspaceId = await resolver.resolve();
+  const client = new LocusClient({
+    baseUrl: apiBase,
+    token: apiKey
+  });
+  return { client, workspaceId, apiKey, apiBase };
+}
+function resolveAiSettings(options) {
+  const settings = new SettingsManager(options.projectPath).load();
+  const provider = resolveProvider3(options.provider || settings.provider);
+  const model = options.model || settings.model || DEFAULT_MODEL[provider];
+  return { provider, model };
+}
+var DEFAULT_API_BASE = "https://api.locusai.dev/api";
+var init_api_context = __esm(() => {
+  init_src2();
+  init_index_node();
+  init_config2();
+  init_settings();
+  init_workspace2();
+});
+
+// ../commands/src/artifacts.ts
+import { existsSync as existsSync14, readdirSync as readdirSync5, readFileSync as readFileSync12, statSync } from "node:fs";
+import { join as join14 } from "node:path";
+function listArtifacts(projectPath) {
+  const artifactsDir = getLocusPath(projectPath, "artifactsDir");
+  if (!existsSync14(artifactsDir)) {
+    return [];
+  }
+  const files = readdirSync5(artifactsDir).filter((f) => f.endsWith(".md"));
+  return files.map((fileName) => {
+    const filePath = join14(artifactsDir, fileName);
+    const stat = statSync(filePath);
+    const name = fileName.replace(/\.md$/, "");
+    return {
+      name,
+      fileName,
+      createdAt: stat.birthtime,
+      size: stat.size
+    };
+  }).sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
+}
+function readArtifact(projectPath, name) {
+  const artifactsDir = getLocusPath(projectPath, "artifactsDir");
+  const fileName = name.endsWith(".md") ? name : `${name}.md`;
+  const filePath = join14(artifactsDir, fileName);
+  if (!existsSync14(filePath)) {
+    return null;
+  }
+  const stat = statSync(filePath);
+  const content = readFileSync12(filePath, "utf-8");
+  return {
+    content,
+    info: {
+      name: fileName.replace(/\.md$/, ""),
+      fileName,
+      createdAt: stat.birthtime,
+      size: stat.size
+    }
+  };
+}
+function findArtifact(projectPath, name) {
+  const exact = readArtifact(projectPath, name);
+  if (exact) {
+    return { match: true, content: exact.content, info: exact.info };
+  }
+  const artifacts = listArtifacts(projectPath);
+  const matches = artifacts.filter((a) => a.name.toLowerCase().includes(name.toLowerCase()));
+  if (matches.length === 1) {
+    const result = readArtifact(projectPath, matches[0].name);
+    if (result) {
+      return { match: true, content: result.content, info: result.info };
+    }
+  }
+  if (matches.length > 1) {
+    return { match: false, ambiguous: matches };
+  }
+  return null;
+}
+function formatSize(bytes) {
+  if (bytes < 1024)
+    return `${bytes}B`;
+  const kb = bytes / 1024;
+  if (kb < 1024)
+    return `${kb.toFixed(1)}KB`;
+  const mb = kb / 1024;
+  return `${mb.toFixed(1)}MB`;
+}
+function formatDate(date5) {
+  return date5.toLocaleDateString("en-US", {
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+    hour: "2-digit",
+    minute: "2-digit"
+  });
+}
+var init_artifacts = __esm(() => {
+  init_index_node();
+});
+
+// ../commands/src/discussions.ts
+function listDiscussions(manager) {
+  const discussions = manager.list();
+  return discussions.map((d) => ({
+    id: d.id,
+    title: d.title,
+    status: d.status,
+    messageCount: d.messages.length,
+    insightCount: d.insights.length,
+    createdAt: d.createdAt
+  }));
+}
+function showDiscussion(manager, id) {
+  return manager.getMarkdown(id);
+}
+function archiveDiscussion(manager, id) {
+  manager.archive(id);
+}
+function deleteDiscussion(manager, id) {
+  manager.delete(id);
+}
+
+// ../commands/src/plans.ts
+function listPlans(manager, status) {
+  const plans = manager.list(status);
+  return plans.map((p) => ({
+    id: p.id,
+    name: p.name,
+    status: p.status,
+    taskCount: p.tasks.length,
+    directive: p.directive,
+    createdAt: p.createdAt,
+    feedback: p.feedback
+  }));
+}
+function showPlan(manager, idOrSlug) {
+  return manager.getMarkdown(idOrSlug);
+}
+function cancelPlan(manager, idOrSlug) {
+  manager.cancel(idOrSlug);
+}
+function rejectPlan(manager, idOrSlug, feedback) {
+  return manager.reject(idOrSlug, feedback);
+}
+
+// ../commands/src/index.ts
+var init_src3 = __esm(() => {
+  init_api_context();
+  init_artifacts();
+  init_config2();
+  init_logger();
+  init_settings();
+  init_workspace2();
+});
+
 // src/utils/version.ts
-import { existsSync as existsSync12, readFileSync as readFileSync11 } from "node:fs";
-import { dirname as dirname3, join as join12 } from "node:path";
+import { existsSync as existsSync15, readFileSync as readFileSync13 } from "node:fs";
+import { dirname as dirname3, join as join15 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function getVersion() {
   try {
     const __filename2 = fileURLToPath3(import.meta.url);
     const __dirname2 = dirname3(__filename2);
-    const bundledPath = join12(__dirname2, "..", "package.json");
-    const sourcePath = join12(__dirname2, "..", "..", "package.json");
-    if (existsSync12(bundledPath)) {
-      const pkg = JSON.parse(readFileSync11(bundledPath, "utf-8"));
+    const bundledPath = join15(__dirname2, "..", "package.json");
+    const sourcePath = join15(__dirname2, "..", "..", "package.json");
+    if (existsSync15(bundledPath)) {
+      const pkg = JSON.parse(readFileSync13(bundledPath, "utf-8"));
       if (pkg.name === "@locusai/cli") {
         return pkg.version || "0.0.0";
       }
     }
-    if (existsSync12(sourcePath)) {
-      const pkg = JSON.parse(readFileSync11(sourcePath, "utf-8"));
+    if (existsSync15(sourcePath)) {
+      const pkg = JSON.parse(readFileSync13(sourcePath, "utf-8"));
       if (pkg.name === "@locusai/cli") {
         return pkg.version || "0.0.0";
       }
@@ -41957,13 +42109,6 @@ var init_banner = __esm(() => {
 });
 
 // src/utils/helpers.ts
-import { existsSync as existsSync13 } from "node:fs";
-import { join as join13 } from "node:path";
-function isProjectInitialized(projectPath) {
-  const locusDir = join13(projectPath, LOCUS_CONFIG.dir);
-  const configPath = join13(locusDir, LOCUS_CONFIG.configFile);
-  return existsSync13(locusDir) && existsSync13(configPath);
-}
 function requireInitialization(projectPath, command) {
   if (!isProjectInitialized(projectPath)) {
     console.error(`
@@ -41979,15 +42124,16 @@ function requireInitialization(projectPath, command) {
     process.exit(1);
   }
 }
-function resolveProvider3(input) {
-  if (!input)
-    return PROVIDER.CLAUDE;
-  if (input === PROVIDER.CLAUDE || input === PROVIDER.CODEX)
-    return input;
-  console.error(c.error(`Error: invalid provider '${input}'. Use 'claude' or 'codex'.`));
-  process.exit(1);
+function resolveProvider4(input) {
+  try {
+    return resolveProvider3(input);
+  } catch {
+    console.error(c.error(`Error: invalid provider '${input}'. Use 'claude' or 'codex'.`));
+    process.exit(1);
+  }
 }
 var init_helpers2 = __esm(() => {
+  init_src3();
   init_index_node();
 });
 
@@ -41998,17 +42144,107 @@ var init_utils3 = __esm(() => {
   init_version();
 });
 
-// src/config-manager.ts
+// src/templates.ts
+var LOCUS_GITIGNORE_MARKER = "# Locus AI", LOCUS_MD_TEMPLATE = `## Planning First
+
+Complex tasks must be planned before writing code. Create ".locus/plans/<task-name>.md" with:
+- **Goal**: What we're trying to achieve and why
+- **Approach**: Step-by-step strategy with technical decisions
+- **Affected files**: List of files to create/modify/delete
+- **Acceptance criteria**: Specific, testable conditions for completion
+- **Dependencies**: Required packages, APIs, or external services
+
+Delete the planning .md files after successful execution.
+
+## Code Quality
+
+- **Follow existing patterns**: Run formatters and linters before finishing (check "package.json" scripts or project config)
+- **Minimize changes**: Keep modifications atomic. Separate refactors from behavioral changes into different tasks
+- **Never commit secrets**: No API keys, passwords, or credentials in code. Use environment variables or secret management
+- **Test as you go**: If tests exist, run relevant ones. If breaking changes occur, update tests accordingly
+- **Comment complex logic**: Explain *why*, not *what*. Focus on business logic and non-obvious decisions
+
+## Artifacts
+
+When a task produces knowledge, analysis, or research output rather than (or in addition to) code changes, you **must** save results as Markdown in ".locus/artifacts/<descriptive-name>.md":
+
+**Always create artifacts for:**
+- Code quality audits, security reviews, vulnerability assessments
+- Architecture analyses, system design proposals, or recommendations
+- Dependency reports, performance profiling, benchmarking results
+- Research summaries, technology comparisons, or feasibility studies
+- Migration plans, deployment strategies, or rollback procedures
+- Post-mortems, incident analysis, or debugging investigations
+
+**Artifact structure:**
+- Clear title and date
+- Executive summary (2-3 sentences)
+- Detailed findings/analysis
+- Actionable recommendations (if applicable)
+
+## Git Operations
+
+- **Do NOT run**: git add, git commit, git push, git checkout, git branch, or any git commands
+- **Why**: The Locus orchestrator handles all version control automatically after execution
+- **Your role**: Focus solely on making file changes. The system commits, pushes, and creates PRs
+
+## Continuous Learning
+
+Read ".locus/LEARNINGS.md" **before starting any task** to avoid repeating mistakes.
+
+**When to update:**
+- User corrects your approach or provides guidance
+- You discover a better pattern while working
+- A decision prevents future confusion (e.g., "use X not Y because Z")
+- You encounter and solve a tricky problem
+
+**What to record:**
+- Architectural decisions and their rationale
+- Preferred libraries, tools, or patterns for this project
+- Common pitfalls and how to avoid them
+- Project-specific conventions or user preferences
+- Solutions to non-obvious problems
+
+**Format (append-only, never delete):**
+
+"""
+- **[Category]**: Concise description (1-2 lines max). *Context if needed.*
+"""
+
+**Categories:** Architecture, Dependencies, Patterns, Debugging, Performance, Security, DevOps, User Preferences
+
+## Error Handling
+
+- **Read error messages carefully**: Don't guess. Parse the actual error before proposing fixes
+- **Check dependencies first**: Missing packages, wrong versions, and environment issues are common
+- **Verify assumptions**: If something "should work," confirm it actually does in this environment
+- **Ask for context**: If you need environment details, configuration, or logs, request them explicitly
+
+## Communication
+
+- **Be precise**: When uncertain, state what you know and what you're assuming
+- **Show your work**: For complex changes, briefly explain the approach before executing
+- **Highlight trade-offs**: If multiple approaches exist, note why you chose one over others
+- **Request feedback**: For ambiguous requirements, propose an approach and ask for confirmation
+`, DEFAULT_LEARNINGS_MD = `# Learnings
+
+This file captures important lessons, decisions, and corrections made during development.
+It is read by AI agents before every task to avoid repeating mistakes and to follow established patterns.
+
+<!-- Add learnings below this line. Format: - **[Category]**: Description -->
+`;
+
+// src/git-helpers.ts
 import { execSync as execSync2 } from "node:child_process";
-import { existsSync as existsSync14, mkdirSync as mkdirSync7, readFileSync as readFileSync12, writeFileSync as writeFileSync6 } from "node:fs";
-import { join as join14 } from "node:path";
+import { existsSync as existsSync16, readFileSync as readFileSync14, writeFileSync as writeFileSync7 } from "node:fs";
+import { join as join16 } from "node:path";
 function updateGitignore(projectPath) {
-  const gitignorePath = join14(projectPath, ".gitignore");
+  const gitignorePath = join16(projectPath, ".gitignore");
   let content = "";
   const locusBlock = LOCUS_GITIGNORE_PATTERNS.join(`
 `);
-  if (existsSync14(gitignorePath)) {
-    content = readFileSync12(gitignorePath, "utf-8");
+  if (existsSync16(gitignorePath)) {
+    content = readFileSync14(gitignorePath, "utf-8");
     if (content.includes(LOCUS_GITIGNORE_MARKER)) {
       const lines = content.split(`
 `);
@@ -42025,7 +42261,7 @@ function updateGitignore(projectPath) {
       const after = lines.slice(endIdx + 1);
       content = [...before, locusBlock, ...after].join(`
 `);
-      writeFileSync6(gitignorePath, content);
+      writeFileSync7(gitignorePath, content);
       return;
     }
     if (content.length > 0 && !content.endsWith(`
@@ -42040,7 +42276,7 @@ function updateGitignore(projectPath) {
   }
   content += `${locusBlock}
 `;
-  writeFileSync6(gitignorePath, content);
+  writeFileSync7(gitignorePath, content);
 }
 function ensureGitIdentity(projectPath) {
   const hasName = (() => {
@@ -42080,6 +42316,13 @@ function ensureGitIdentity(projectPath) {
     stdio: "ignore"
   });
 }
+var init_git_helpers = __esm(() => {
+  init_index_node();
+});
+
+// src/config-manager.ts
+import { existsSync as existsSync17, mkdirSync as mkdirSync7, readFileSync as readFileSync15, writeFileSync as writeFileSync8 } from "node:fs";
+import { join as join17 } from "node:path";
 
 class ConfigManager {
   projectPath;
@@ -42087,9 +42330,9 @@ class ConfigManager {
     this.projectPath = projectPath;
   }
   async init(version2) {
-    const locusConfigDir = join14(this.projectPath, LOCUS_CONFIG.dir);
+    const locusConfigDir = join17(this.projectPath, LOCUS_CONFIG.dir);
     const locusConfigPath = getLocusPath(this.projectPath, "configFile");
-    if (!existsSync14(locusConfigDir)) {
+    if (!existsSync17(locusConfigDir)) {
       mkdirSync7(locusConfigDir, { recursive: true });
     }
     const locusSubdirs = [
@@ -42101,35 +42344,35 @@ class ConfigManager {
       LOCUS_CONFIG.discussionsDir
     ];
     for (const subdir of locusSubdirs) {
-      const subdirPath = join14(locusConfigDir, subdir);
-      if (!existsSync14(subdirPath)) {
+      const subdirPath = join17(locusConfigDir, subdir);
+      if (!existsSync17(subdirPath)) {
         mkdirSync7(subdirPath, { recursive: true });
       }
     }
     const locusMdPath = getLocusPath(this.projectPath, "contextFile");
-    if (!existsSync14(locusMdPath)) {
-      writeFileSync6(locusMdPath, LOCUS_MD_TEMPLATE);
+    if (!existsSync17(locusMdPath)) {
+      writeFileSync8(locusMdPath, LOCUS_MD_TEMPLATE);
     }
     const learningsMdPath = getLocusPath(this.projectPath, "learningsFile");
-    if (!existsSync14(learningsMdPath)) {
-      writeFileSync6(learningsMdPath, DEFAULT_LEARNINGS_MD);
+    if (!existsSync17(learningsMdPath)) {
+      writeFileSync8(learningsMdPath, DEFAULT_LEARNINGS_MD);
     }
-    if (!existsSync14(locusConfigPath)) {
+    if (!existsSync17(locusConfigPath)) {
       const config2 = {
         $schema: LOCUS_SCHEMAS.config,
         version: version2,
         createdAt: new Date().toISOString(),
         projectPath: "."
       };
-      writeFileSync6(locusConfigPath, JSON.stringify(config2, null, 2));
+      writeFileSync8(locusConfigPath, JSON.stringify(config2, null, 2));
     }
     updateGitignore(this.projectPath);
     ensureGitIdentity(this.projectPath);
   }
   loadConfig() {
     const path2 = getLocusPath(this.projectPath, "configFile");
-    if (existsSync14(path2)) {
-      return JSON.parse(readFileSync12(path2, "utf-8"));
+    if (existsSync17(path2)) {
+      return JSON.parse(readFileSync15(path2, "utf-8"));
     }
     return null;
   }
@@ -42159,19 +42402,19 @@ class ConfigManager {
         this.saveConfig(config2);
       }
     }
-    const settingsPath = join14(this.projectPath, LOCUS_CONFIG.dir, LOCUS_CONFIG.settingsFile);
-    if (existsSync14(settingsPath)) {
-      const raw = readFileSync12(settingsPath, "utf-8");
+    const settingsPath = join17(this.projectPath, LOCUS_CONFIG.dir, LOCUS_CONFIG.settingsFile);
+    if (existsSync17(settingsPath)) {
+      const raw = readFileSync15(settingsPath, "utf-8");
       const settings = JSON.parse(raw);
       if (settings.$schema !== LOCUS_SCHEMAS.settings) {
         const { $schema: _2, ...rest } = settings;
         const ordered = { $schema: LOCUS_SCHEMAS.settings, ...rest };
-        writeFileSync6(settingsPath, JSON.stringify(ordered, null, 2), "utf-8");
+        writeFileSync8(settingsPath, JSON.stringify(ordered, null, 2), "utf-8");
       }
     }
     const locusMdPath = getLocusPath(this.projectPath, "contextFile");
-    const locusMdExisted = existsSync14(locusMdPath);
-    writeFileSync6(locusMdPath, LOCUS_MD_TEMPLATE);
+    const locusMdExisted = existsSync17(locusMdPath);
+    writeFileSync8(locusMdPath, LOCUS_MD_TEMPLATE);
     if (!locusMdExisted) {
       result.directoriesCreated.push(".locus/LOCUS.md");
     }
@@ -42183,23 +42426,23 @@ class ConfigManager {
       LOCUS_CONFIG.plansDir,
       LOCUS_CONFIG.discussionsDir
     ];
-    const locusConfigDir = join14(this.projectPath, LOCUS_CONFIG.dir);
+    const locusConfigDir = join17(this.projectPath, LOCUS_CONFIG.dir);
     for (const subdir of locusSubdirs) {
-      const subdirPath = join14(locusConfigDir, subdir);
-      if (!existsSync14(subdirPath)) {
+      const subdirPath = join17(locusConfigDir, subdir);
+      if (!existsSync17(subdirPath)) {
         mkdirSync7(subdirPath, { recursive: true });
         result.directoriesCreated.push(`.locus/${subdir}`);
       }
     }
     const learningsMdPath = getLocusPath(this.projectPath, "learningsFile");
-    if (!existsSync14(learningsMdPath)) {
-      writeFileSync6(learningsMdPath, DEFAULT_LEARNINGS_MD);
+    if (!existsSync17(learningsMdPath)) {
+      writeFileSync8(learningsMdPath, DEFAULT_LEARNINGS_MD);
       result.directoriesCreated.push(".locus/LEARNINGS.md");
     }
-    const gitignorePath = join14(this.projectPath, ".gitignore");
-    const gitignoreBefore = existsSync14(gitignorePath) ? readFileSync12(gitignorePath, "utf-8") : "";
+    const gitignorePath = join17(this.projectPath, ".gitignore");
+    const gitignoreBefore = existsSync17(gitignorePath) ? readFileSync15(gitignorePath, "utf-8") : "";
     updateGitignore(this.projectPath);
-    const gitignoreAfter = readFileSync12(gitignorePath, "utf-8");
+    const gitignoreAfter = readFileSync15(gitignorePath, "utf-8");
     if (gitignoreBefore !== gitignoreAfter) {
       result.gitignoreUpdated = true;
     }
@@ -42210,177 +42453,12 @@ class ConfigManager {
     const { $schema: _2, ...rest } = config2;
     const ordered = { $schema: LOCUS_SCHEMAS.config, ...rest };
     const path2 = getLocusPath(this.projectPath, "configFile");
-    writeFileSync6(path2, JSON.stringify(ordered, null, 2));
+    writeFileSync8(path2, JSON.stringify(ordered, null, 2));
   }
 }
-var LOCUS_GITIGNORE_MARKER = "# Locus AI", LOCUS_MD_TEMPLATE = `## Planning First
-
-Complex tasks must be planned before writing code. Create ".locus/plans/<task-name>.md" with:
-- **Goal**: What we're trying to achieve and why
-- **Approach**: Step-by-step strategy with technical decisions
-- **Affected files**: List of files to create/modify/delete
-- **Acceptance criteria**: Specific, testable conditions for completion
-- **Dependencies**: Required packages, APIs, or external services
-
-Delete the planning .md files after successful execution.
-
-## Code Quality
-
-- **Follow existing patterns**: Run formatters and linters before finishing (check "package.json" scripts or project config)
-- **Minimize changes**: Keep modifications atomic. Separate refactors from behavioral changes into different tasks
-- **Never commit secrets**: No API keys, passwords, or credentials in code. Use environment variables or secret management
-- **Test as you go**: If tests exist, run relevant ones. If breaking changes occur, update tests accordingly
-- **Comment complex logic**: Explain *why*, not *what*. Focus on business logic and non-obvious decisions
-
-## Artifacts
-
-When a task produces knowledge, analysis, or research output rather than (or in addition to) code changes, you **must** save results as Markdown in ".locus/artifacts/<descriptive-name>.md":
-
-**Always create artifacts for:**
-- Code quality audits, security reviews, vulnerability assessments
-- Architecture analyses, system design proposals, or recommendations
-- Dependency reports, performance profiling, benchmarking results
-- Research summaries, technology comparisons, or feasibility studies
-- Migration plans, deployment strategies, or rollback procedures
-- Post-mortems, incident analysis, or debugging investigations
-
-**Artifact structure:**
-- Clear title and date
-- Executive summary (2-3 sentences)
-- Detailed findings/analysis
-- Actionable recommendations (if applicable)
-
-## Git Operations
-
-- **Do NOT run**: git add, git commit, git push, git checkout, git branch, or any git commands
-- **Why**: The Locus orchestrator handles all version control automatically after execution
-- **Your role**: Focus solely on making file changes. The system commits, pushes, and creates PRs
-
-## Continuous Learning
-
-Read ".locus/LEARNINGS.md" **before starting any task** to avoid repeating mistakes.
-
-**When to update:**
-- User corrects your approach or provides guidance
-- You discover a better pattern while working
-- A decision prevents future confusion (e.g., "use X not Y because Z")
-- You encounter and solve a tricky problem
-
-**What to record:**
-- Architectural decisions and their rationale
-- Preferred libraries, tools, or patterns for this project
-- Common pitfalls and how to avoid them
-- Project-specific conventions or user preferences
-- Solutions to non-obvious problems
-
-**Format (append-only, never delete):**
-
-"""
-- **[Category]**: Concise description (1-2 lines max). *Context if needed.*
-"""
-
-**Categories:** Architecture, Dependencies, Patterns, Debugging, Performance, Security, DevOps, User Preferences
-
-## Error Handling
-
-- **Read error messages carefully**: Don't guess. Parse the actual error before proposing fixes
-- **Check dependencies first**: Missing packages, wrong versions, and environment issues are common
-- **Verify assumptions**: If something "should work," confirm it actually does in this environment
-- **Ask for context**: If you need environment details, configuration, or logs, request them explicitly
-
-## Communication
-
-- **Be precise**: When uncertain, state what you know and what you're assuming
-- **Show your work**: For complex changes, briefly explain the approach before executing
-- **Highlight trade-offs**: If multiple approaches exist, note why you chose one over others
-- **Request feedback**: For ambiguous requirements, propose an approach and ask for confirmation
-`, DEFAULT_LEARNINGS_MD = `# Learnings
-
-This file captures important lessons, decisions, and corrections made during development.
-It is read by AI agents before every task to avoid repeating mistakes and to follow established patterns.
-
-<!-- Add learnings below this line. Format: - **[Category]**: Description -->
-`;
 var init_config_manager = __esm(() => {
   init_index_node();
-});
-
-// src/settings-manager.ts
-import { existsSync as existsSync15, readFileSync as readFileSync13, unlinkSync as unlinkSync4, writeFileSync as writeFileSync7 } from "node:fs";
-import { join as join15 } from "node:path";
-function getSettingsPath(projectPath) {
-  return join15(projectPath, LOCUS_CONFIG.dir, LOCUS_CONFIG.settingsFile);
-}
-
-class SettingsManager {
-  projectPath;
-  constructor(projectPath) {
-    this.projectPath = projectPath;
-  }
-  load() {
-    const settingsPath = getSettingsPath(this.projectPath);
-    if (!existsSync15(settingsPath)) {
-      return {};
-    }
-    return JSON.parse(readFileSync13(settingsPath, "utf-8"));
-  }
-  save(settings) {
-    const { $schema: _2, ...rest } = settings;
-    const ordered = { $schema: LOCUS_SCHEMAS.settings, ...rest };
-    const settingsPath = getSettingsPath(this.projectPath);
-    writeFileSync7(settingsPath, JSON.stringify(ordered, null, 2), "utf-8");
-  }
-  get(key) {
-    return this.load()[key];
-  }
-  set(key, value) {
-    const settings = this.load();
-    settings[key] = value;
-    this.save(settings);
-  }
-  remove() {
-    const settingsPath = getSettingsPath(this.projectPath);
-    if (existsSync15(settingsPath)) {
-      unlinkSync4(settingsPath);
-    }
-  }
-  exists() {
-    return existsSync15(getSettingsPath(this.projectPath));
-  }
-}
-var init_settings_manager = __esm(() => {
-  init_index_node();
-});
-
-// src/workspace-resolver.ts
-class WorkspaceResolver {
-  options;
-  constructor(options) {
-    this.options = options;
-  }
-  async resolve() {
-    if (this.options.workspaceId) {
-      return this.options.workspaceId;
-    }
-    try {
-      console.log(c.dim("ℹ  Resolving workspace from API key..."));
-      const client = new LocusClient({
-        baseUrl: this.options.apiBase,
-        token: this.options.apiKey
-      });
-      const info = await client.auth.getApiKeyInfo();
-      if (info.workspaceId) {
-        console.log(c.success(`✓  Resolved workspace: ${info.workspaceId}`));
-        return info.workspaceId;
-      }
-      throw new Error("API key is not associated with a workspace. Please specify --workspace.");
-    } catch (error48) {
-      throw new Error(`Error resolving workspace: ${error48 instanceof Error ? error48.message : String(error48)}`);
-    }
-  }
-}
-var init_workspace_resolver = __esm(() => {
-  init_index_node();
+  init_git_helpers();
 });
 
 // src/commands/plan.ts
@@ -42388,8 +42466,8 @@ var exports_plan = {};
 __export(exports_plan, {
   planCommand: () => planCommand
 });
-import { existsSync as existsSync16, unlinkSync as unlinkSync5 } from "node:fs";
-import { join as join16 } from "node:path";
+import { existsSync as existsSync18, unlinkSync as unlinkSync5 } from "node:fs";
+import { join as join18 } from "node:path";
 import { parseArgs } from "node:util";
 function normalizePlanIdArgs(args) {
   const planIdFlags = new Set(["--approve", "--reject", "--cancel", "--show"]);
@@ -42433,13 +42511,34 @@ async function planCommand(args) {
   requireInitialization(projectPath, "plan");
   const planManager = new PlanManager(projectPath);
   if (values.list) {
-    return listPlans(planManager);
+    return renderPlanList(planManager);
   }
   if (values.show) {
-    return showPlan(planManager, values.show);
+    const md = showPlan(planManager, values.show);
+    if (!md) {
+      console.error(`
+  ${c.error("✖")} ${c.red(`Plan not found: ${values.show}`)}
+`);
+      process.exit(1);
+    }
+    console.log(`
+${md}
+`);
+    return;
   }
   if (values.cancel) {
-    return cancelPlan(planManager, values.cancel);
+    try {
+      cancelPlan(planManager, values.cancel);
+      console.log(`
+  ${c.success("✔")} ${c.dim("Plan cancelled.")}
+`);
+    } catch (error48) {
+      console.error(`
+  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
+`);
+      process.exit(1);
+    }
+    return;
   }
   if (values.reject) {
     const feedback2 = values.feedback;
@@ -42451,30 +42550,59 @@ async function planCommand(args) {
 `);
       process.exit(1);
     }
-    return rejectPlan(planManager, values.reject, feedback2);
+    try {
+      const plan = rejectPlan(planManager, values.reject, feedback2);
+      console.log(`
+  ${c.warning("!")} ${c.bold("Plan rejected:")} ${plan.name}
+`);
+      console.log(`  ${c.dim("Feedback saved:")} ${feedback2}
+`);
+      console.log(`  ${c.dim("Re-run the planning meeting with the same directive to incorporate feedback:")}`);
+      console.log(`  ${c.cyan(`locus plan "${plan.directive}"`)}
+`);
+    } catch (error48) {
+      console.error(`
+  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
+`);
+      process.exit(1);
+    }
+    return;
   }
   if (values.approve) {
-    const { client, workspaceId } = await resolveApiContext(projectPath, values);
-    return approvePlan(planManager, values.approve, client, workspaceId);
+    const configManager = new ConfigManager(projectPath);
+    configManager.updateVersion(VERSION2);
+    try {
+      const { client, workspaceId } = await resolveApiContext({
+        projectPath,
+        apiKey: values["api-key"],
+        apiUrl: values["api-url"],
+        workspaceId: values.workspace
+      });
+      return await renderApprovePlan(planManager, values.approve, client, workspaceId);
+    } catch (error48) {
+      console.error(`
+  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
+`);
+      process.exit(1);
+    }
   }
   const directive = positionals.join(" ").trim();
   if (!directive) {
     showPlanHelp();
     return;
   }
-  const planSettings = new SettingsManager(projectPath).load();
-  const provider = resolveProvider3(values.provider || planSettings.provider);
-  const model = values.model || planSettings.model || DEFAULT_MODEL[provider];
+  const { provider, model } = resolveAiSettings({
+    projectPath,
+    provider: values.provider,
+    model: values.model
+  });
   const reasoningEffort = values["reasoning-effort"];
   const aiRunner = createAiRunner(provider, {
     projectPath,
     model,
     reasoningEffort
   });
-  const log = (message, level) => {
-    const icon = level === "success" ? c.success("✔") : level === "error" ? c.error("✖") : level === "warn" ? c.warning("!") : c.info("●");
-    console.log(`  ${icon} ${message}`);
-  };
+  const log = createCliLogger();
   console.log(`
   ${c.header(" PLANNING MEETING ")} ${c.bold("Starting async planning meeting...")}
 `);
@@ -42496,8 +42624,8 @@ async function planCommand(args) {
   try {
     const result = await meeting.run(directive, feedback);
     planManager.save(result.plan);
-    const tempFile = join16(getLocusPath(projectPath, "plansDir"), `${result.plan.id}.json`);
-    if (existsSync16(tempFile)) {
+    const tempFile = join18(getLocusPath(projectPath, "plansDir"), `${result.plan.id}.json`);
+    if (existsSync18(tempFile)) {
       unlinkSync5(tempFile);
     }
     console.log(`
@@ -42518,8 +42646,8 @@ async function planCommand(args) {
     process.exit(1);
   }
 }
-function listPlans(planManager) {
-  const plans = planManager.list();
+function renderPlanList(planManager) {
+  const plans = listPlans(planManager);
   if (plans.length === 0) {
     console.log(`
   ${c.dim("No plans found.")}
@@ -42533,7 +42661,7 @@ function listPlans(planManager) {
 `);
   for (const plan of plans) {
     const statusIcon = plan.status === "pending" ? c.warning("◯") : plan.status === "approved" ? c.success("✔") : plan.status === "rejected" ? c.error("✖") : c.dim("⊘");
-    console.log(`  ${statusIcon} ${c.bold(plan.name)} ${c.dim(`[${plan.status}]`)} ${c.dim(`— ${plan.tasks.length} tasks`)}`);
+    console.log(`  ${statusIcon} ${c.bold(plan.name)} ${c.dim(`[${plan.status}]`)} ${c.dim(`— ${plan.taskCount} tasks`)}`);
     console.log(`    ${c.dim("ID:")} ${plan.id}`);
     console.log(`    ${c.dim("Created:")} ${plan.createdAt}`);
     if (plan.feedback) {
@@ -42542,50 +42670,7 @@ function listPlans(planManager) {
     console.log("");
   }
 }
-function showPlan(planManager, idOrSlug) {
-  const md = planManager.getMarkdown(idOrSlug);
-  if (!md) {
-    console.error(`
-  ${c.error("✖")} ${c.red(`Plan not found: ${idOrSlug}`)}
-`);
-    process.exit(1);
-  }
-  console.log(`
-${md}
-`);
-}
-function cancelPlan(planManager, idOrSlug) {
-  try {
-    planManager.cancel(idOrSlug);
-    console.log(`
-  ${c.success("✔")} ${c.dim("Plan cancelled.")}
-`);
-  } catch (error48) {
-    console.error(`
-  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
-`);
-    process.exit(1);
-  }
-}
-function rejectPlan(planManager, idOrSlug, feedback) {
-  try {
-    const plan = planManager.reject(idOrSlug, feedback);
-    console.log(`
-  ${c.warning("!")} ${c.bold("Plan rejected:")} ${plan.name}
-`);
-    console.log(`  ${c.dim("Feedback saved:")} ${feedback}
-`);
-    console.log(`  ${c.dim("Re-run the planning meeting with the same directive to incorporate feedback:")}`);
-    console.log(`  ${c.cyan(`locus plan "${plan.directive}"`)}
-`);
-  } catch (error48) {
-    console.error(`
-  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
-`);
-    process.exit(1);
-  }
-}
-async function approvePlan(planManager, idOrSlug, client, workspaceId) {
+async function renderApprovePlan(planManager, idOrSlug, client, workspaceId) {
   try {
     console.log(`
   ${c.info("●")} ${c.bold("Approving plan and creating sprint...")}
@@ -42608,34 +42693,6 @@ async function approvePlan(planManager, idOrSlug, client, workspaceId) {
     process.exit(1);
   }
 }
-async function resolveApiContext(projectPath, values) {
-  const configManager = new ConfigManager(projectPath);
-  configManager.updateVersion(VERSION2);
-  const settingsManager = new SettingsManager(projectPath);
-  const settings = settingsManager.load();
-  const apiKey = values["api-key"] || settings.apiKey;
-  if (!apiKey) {
-    console.error(`
-  ${c.error("✖")} ${c.red("API key is required for this operation")}
-`);
-    console.error(`  ${c.dim(`Configure with: locus config setup --api-key <key>
-  Or pass --api-key flag`)}
-`);
-    process.exit(1);
-  }
-  const apiBase = values["api-url"] || settings.apiUrl || "https://api.locusai.dev/api";
-  const resolver = new WorkspaceResolver({
-    apiKey,
-    apiBase,
-    workspaceId: values.workspace
-  });
-  const workspaceId = await resolver.resolve();
-  const client = new LocusClient({
-    baseUrl: apiBase,
-    token: apiKey
-  });
-  return { client, workspaceId };
-}
 function printPlanSummary(plan) {
   console.log(`  ${c.bold("Sprint:")} ${plan.name}`);
   console.log(`  ${c.bold("Goal:")} ${plan.goal}`);
@@ -42693,11 +42750,10 @@ function showPlanHelp() {
 `);
 }
 var init_plan = __esm(() => {
+  init_src3();
   init_index_node();
   init_config_manager();
-  init_settings_manager();
   init_utils3();
-  init_workspace_resolver();
 });
 
 // src/display/tool-display.ts
@@ -43291,9 +43347,9 @@ var init_progress_renderer = __esm(() => {
 });
 
 // src/repl/image-detect.ts
-import { copyFileSync, existsSync as existsSync18, mkdirSync as mkdirSync8 } from "node:fs";
+import { copyFileSync, existsSync as existsSync19, mkdirSync as mkdirSync8 } from "node:fs";
 import { homedir as homedir2, tmpdir as tmpdir2 } from "node:os";
-import { basename as basename2, join as join18 } from "node:path";
+import { basename as basename2, join as join19 } from "node:path";
 function hasImageExtension(p) {
   const dot = p.lastIndexOf(".");
   if (dot === -1)
@@ -43315,7 +43371,7 @@ function copyToStable(srcPath) {
     mkdirSync8(STABLE_IMAGE_DIR, { recursive: true });
     const ts = Date.now();
     const name = `${ts}-${basename2(srcPath)}`;
-    const destPath = join18(STABLE_IMAGE_DIR, name);
+    const destPath = join19(STABLE_IMAGE_DIR, name);
     copyFileSync(srcPath, destPath);
     return destPath;
   } catch {
@@ -43335,7 +43391,7 @@ function detectImages(input) {
     let exists = false;
     let stablePath = normalized;
     try {
-      exists = existsSync18(normalized);
+      exists = existsSync19(normalized);
     } catch {}
     if (exists) {
       const copied = copyToStable(normalized);
@@ -43409,7 +43465,7 @@ var init_image_detect = __esm(() => {
     ".tif",
     ".tiff"
   ]);
-  STABLE_IMAGE_DIR = join18(tmpdir2(), "locus-images");
+  STABLE_IMAGE_DIR = join19(tmpdir2(), "locus-images");
 });
 
 // src/repl/input-handler.ts
@@ -44166,66 +44222,10 @@ var init_interactive_session = __esm(() => {
 init_index_node();
 
 // src/commands/artifacts.ts
+init_src3();
 init_index_node();
 init_utils3();
-import { existsSync as existsSync17, readdirSync as readdirSync5, readFileSync as readFileSync14, statSync } from "node:fs";
-import { join as join17 } from "node:path";
 import { parseArgs as parseArgs2 } from "node:util";
-function listArtifacts(projectPath) {
-  const artifactsDir = getLocusPath(projectPath, "artifactsDir");
-  if (!existsSync17(artifactsDir)) {
-    return [];
-  }
-  const files = readdirSync5(artifactsDir).filter((f) => f.endsWith(".md"));
-  return files.map((fileName) => {
-    const filePath = join17(artifactsDir, fileName);
-    const stat = statSync(filePath);
-    const name = fileName.replace(/\.md$/, "");
-    return {
-      name,
-      fileName,
-      createdAt: stat.birthtime,
-      size: stat.size
-    };
-  }).sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
-}
-function readArtifact(projectPath, name) {
-  const artifactsDir = getLocusPath(projectPath, "artifactsDir");
-  const fileName = name.endsWith(".md") ? name : `${name}.md`;
-  const filePath = join17(artifactsDir, fileName);
-  if (!existsSync17(filePath)) {
-    return null;
-  }
-  const stat = statSync(filePath);
-  const content = readFileSync14(filePath, "utf-8");
-  return {
-    content,
-    info: {
-      name: fileName.replace(/\.md$/, ""),
-      fileName,
-      createdAt: stat.birthtime,
-      size: stat.size
-    }
-  };
-}
-function formatSize(bytes) {
-  if (bytes < 1024)
-    return `${bytes}B`;
-  const kb = bytes / 1024;
-  if (kb < 1024)
-    return `${kb.toFixed(1)}KB`;
-  const mb = kb / 1024;
-  return `${mb.toFixed(1)}MB`;
-}
-function formatDate(date5) {
-  return date5.toLocaleDateString("en-US", {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
-    hour: "2-digit",
-    minute: "2-digit"
-  });
-}
 async function artifactsCommand(args) {
   const { positionals } = parseArgs2({
     args,
@@ -44296,27 +44296,8 @@ async function listArtifactsCommand(projectPath) {
 `);
 }
 async function showArtifact(projectPath, name) {
-  const result = readArtifact(projectPath, name);
+  const result = findArtifact(projectPath, name);
   if (!result) {
-    const artifacts = listArtifacts(projectPath);
-    const matches = artifacts.filter((a) => a.name.toLowerCase().includes(name.toLowerCase()));
-    if (matches.length === 1) {
-      const match = readArtifact(projectPath, matches[0].name);
-      if (match) {
-        printArtifact(match.info, match.content);
-        return;
-      }
-    }
-    if (matches.length > 1) {
-      console.error(`
-  ${c.error("Error:")} Multiple artifacts match "${name}":
-`);
-      for (const m of matches) {
-        console.log(`    ${c.cyan(m.name)}`);
-      }
-      console.log();
-      return;
-    }
     console.error(`
   ${c.error("Error:")} Artifact "${name}" not found
 `);
@@ -44324,6 +44305,16 @@ async function showArtifact(projectPath, name) {
 `);
     return;
   }
+  if (!result.match) {
+    console.error(`
+  ${c.error("Error:")} Multiple artifacts match "${name}":
+`);
+    for (const m of result.ambiguous) {
+      console.log(`    ${c.cyan(m.name)}`);
+    }
+    console.log();
+    return;
+  }
   printArtifact(result.info, result.content);
 }
 function printArtifact(info, content) {
@@ -44337,17 +44328,16 @@ function printArtifact(info, content) {
   console.log(content);
 }
 async function convertToPlan(projectPath, name) {
-  const result = readArtifact(projectPath, name);
+  const result = findArtifact(projectPath, name);
   if (!result) {
-    const artifacts = listArtifacts(projectPath);
-    const matches = artifacts.filter((a) => a.name.toLowerCase().includes(name.toLowerCase()));
-    if (matches.length === 1) {
-      const match = readArtifact(projectPath, matches[0].name);
-      if (match) {
-        await runPlanConversion(match.info.name);
-        return;
-      }
-    }
+    console.error(`
+  ${c.error("Error:")} Artifact "${name}" not found
+`);
+    console.log(`  ${c.dim("Use 'locus artifacts' to see available artifacts")}
+`);
+    return;
+  }
+  if (!result.match) {
     console.error(`
   ${c.error("Error:")} Artifact "${name}" not found
 `);
@@ -44366,8 +44356,8 @@ async function runPlanConversion(artifactName) {
   await planCommand2([directive]);
 }
 // src/commands/config.ts
+init_src3();
 init_index_node();
-init_settings_manager();
 import { createInterface } from "node:readline";
 function ask(question) {
   const rl = createInterface({
@@ -44394,11 +44384,6 @@ var TELEGRAM_KEYS = [
   "telegram.testMode"
 ];
 var ALL_KEYS = [...TOP_LEVEL_KEYS, ...TELEGRAM_KEYS];
-function maskSecret(value) {
-  if (value.length <= 8)
-    return "****";
-  return `${value.slice(0, 4)}...${value.slice(-4)}`;
-}
 function showConfigHelp() {
   console.log(`
   ${c.header(" CONFIG ")}
@@ -44624,11 +44609,11 @@ async function configCommand(args) {
   }
 }
 // src/commands/discuss.ts
+init_src3();
 init_index_node();
 init_progress_renderer();
 init_image_detect();
 init_input_handler();
-init_settings_manager();
 init_utils3();
 import { parseArgs as parseArgs3 } from "node:util";
 async function discussCommand(args) {
@@ -44651,35 +44636,66 @@ async function discussCommand(args) {
   requireInitialization(projectPath, "discuss");
   const discussionManager = new DiscussionManager(projectPath);
   if (values.list) {
-    return listDiscussions(discussionManager);
+    return renderDiscussionList(discussionManager);
   }
   if (values.show) {
-    return showDiscussion(discussionManager, values.show);
+    const md = showDiscussion(discussionManager, values.show);
+    if (!md) {
+      console.error(`
+  ${c.error("✖")} ${c.red(`Discussion not found: ${values.show}`)}
+`);
+      process.exit(1);
+    }
+    console.log(`
+${md}
+`);
+    return;
   }
   if (values.archive) {
-    return archiveDiscussion(discussionManager, values.archive);
+    try {
+      archiveDiscussion(discussionManager, values.archive);
+      console.log(`
+  ${c.success("✔")} ${c.dim("Discussion archived.")}
+`);
+    } catch (error48) {
+      console.error(`
+  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
+`);
+      process.exit(1);
+    }
+    return;
   }
   if (values.delete) {
-    return deleteDiscussion(discussionManager, values.delete);
+    try {
+      deleteDiscussion(discussionManager, values.delete);
+      console.log(`
+  ${c.success("✔")} ${c.dim("Discussion deleted.")}
+`);
+    } catch (error48) {
+      console.error(`
+  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
+`);
+      process.exit(1);
+    }
+    return;
   }
   const topic = positionals.join(" ").trim();
   if (!topic) {
     showDiscussHelp();
     return;
   }
-  const settings = new SettingsManager(projectPath).load();
-  const provider = resolveProvider3(values.provider || settings.provider);
-  const model = values.model || settings.model || DEFAULT_MODEL[provider];
+  const { provider, model } = resolveAiSettings({
+    projectPath,
+    provider: values.provider,
+    model: values.model
+  });
   const reasoningEffort = values["reasoning-effort"];
   const aiRunner = createAiRunner(provider, {
     projectPath,
     model,
     reasoningEffort
   });
-  const log = (message, level) => {
-    const icon = level === "success" ? c.success("✔") : level === "error" ? c.error("✖") : level === "warn" ? c.warning("!") : c.info("●");
-    console.log(`  ${icon} ${message}`);
-  };
+  const log = createCliLogger();
   const facilitator = new DiscussionFacilitator({
     projectPath,
     aiRunner,
@@ -44865,8 +44881,8 @@ async function discussCommand(args) {
   inputHandler.start();
   inputHandler.showPrompt();
 }
-function listDiscussions(discussionManager) {
-  const discussions = discussionManager.list();
+function renderDiscussionList(discussionManager) {
+  const discussions = listDiscussions(discussionManager);
   if (discussions.length === 0) {
     console.log(`
   ${c.dim("No discussions found.")}
@@ -44880,50 +44896,12 @@ function listDiscussions(discussionManager) {
 `);
   for (const disc of discussions) {
     const statusIcon = disc.status === "active" ? c.warning("◯") : disc.status === "completed" ? c.success("✔") : c.dim("⊘");
-    console.log(`  ${statusIcon} ${c.bold(disc.title)} ${c.dim(`[${disc.status}]`)} ${c.dim(`— ${disc.messages.length} messages, ${disc.insights.length} insights`)}`);
+    console.log(`  ${statusIcon} ${c.bold(disc.title)} ${c.dim(`[${disc.status}]`)} ${c.dim(`— ${disc.messageCount} messages, ${disc.insightCount} insights`)}`);
     console.log(`    ${c.dim("ID:")} ${disc.id}`);
     console.log(`    ${c.dim("Created:")} ${disc.createdAt}`);
     console.log("");
   }
 }
-function showDiscussion(discussionManager, id) {
-  const md = discussionManager.getMarkdown(id);
-  if (!md) {
-    console.error(`
-  ${c.error("✖")} ${c.red(`Discussion not found: ${id}`)}
-`);
-    process.exit(1);
-  }
-  console.log(`
-${md}
-`);
-}
-function archiveDiscussion(discussionManager, id) {
-  try {
-    discussionManager.archive(id);
-    console.log(`
-  ${c.success("✔")} ${c.dim("Discussion archived.")}
-`);
-  } catch (error48) {
-    console.error(`
-  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
-`);
-    process.exit(1);
-  }
-}
-function deleteDiscussion(discussionManager, id) {
-  try {
-    discussionManager.delete(id);
-    console.log(`
-  ${c.success("✔")} ${c.dim("Discussion deleted.")}
-`);
-  } catch (error48) {
-    console.error(`
-  ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
-`);
-    process.exit(1);
-  }
-}
 function showCurrentInsights(discussionManager, discussionId) {
   const discussion2 = discussionManager.load(discussionId);
   if (!discussion2 || discussion2.insights.length === 0) {
@@ -45014,11 +44992,10 @@ function showDiscussHelp() {
 `);
 }
 // src/commands/docs.ts
+init_src3();
 init_index_node();
 init_config_manager();
-init_settings_manager();
 init_utils3();
-init_workspace_resolver();
 import { parseArgs as parseArgs4 } from "node:util";
 async function docsCommand(args) {
   const subcommand = args[0];
@@ -45052,55 +45029,25 @@ async function docsSyncCommand(args) {
   requireInitialization(projectPath, "docs sync");
   const configManager = new ConfigManager(projectPath);
   configManager.updateVersion(VERSION2);
-  const settingsManager = new SettingsManager(projectPath);
-  const settings = settingsManager.load();
-  const apiKey = values["api-key"] || settings.apiKey;
-  if (!apiKey) {
-    console.error(`
-  ${c.error("✖")} ${c.red("API key is required")}
-` + `  ${c.dim(`Configure with: locus config setup --api-key <key>
-  Or pass --api-key flag`)}
-`);
-    process.exit(1);
-  }
-  const apiBase = values["api-url"] || settings.apiUrl || "https://api.locusai.dev/api";
-  const resolver = new WorkspaceResolver({
-    apiKey,
-    apiBase,
-    workspaceId: values.workspace
-  });
-  let workspaceId;
+  let apiContext;
   try {
-    workspaceId = await resolver.resolve();
+    apiContext = await resolveApiContext({
+      projectPath,
+      apiKey: values["api-key"],
+      apiUrl: values["api-url"],
+      workspaceId: values.workspace
+    });
   } catch (error48) {
     console.error(`
   ${c.error("✖")} ${c.red(error48 instanceof Error ? error48.message : String(error48))}
 `);
     process.exit(1);
   }
-  const client = new LocusClient({
-    baseUrl: apiBase,
-    token: apiKey
-  });
   const fetcher = new DocumentFetcher({
-    client,
-    workspaceId,
+    client: apiContext.client,
+    workspaceId: apiContext.workspaceId,
     projectPath,
-    log: (message, level) => {
-      if (level === "error") {
-        console.log(`  ${c.error("✖")} ${message}`);
-        return;
-      }
-      if (level === "warn") {
-        console.log(`  ${c.warning("!")} ${message}`);
-        return;
-      }
-      if (level === "success") {
-        console.log(`  ${c.success("✔")} ${message}`);
-        return;
-      }
-      console.log(`  ${c.info("●")} ${message}`);
-    }
+    log: createCliLogger()
   });
   console.log(`
   ${c.info("●")} ${c.bold("Syncing docs from API...")}
@@ -45279,7 +45226,11 @@ class JsonStreamRenderer {
 
 // src/commands/exec.ts
 init_progress_renderer();
-init_settings_manager();
+
+// src/settings-manager.ts
+init_src3();
+
+// src/commands/exec.ts
 init_utils3();
 
 // src/commands/exec-sessions.ts
@@ -45491,7 +45442,7 @@ async function execCommand(args) {
     }
   }
   const execSettings = new SettingsManager(projectPath).load();
-  const provider = resolveProvider3(values.provider || execSettings.provider);
+  const provider = resolveProvider4(values.provider || execSettings.provider);
   const model = values.model || execSettings.model || DEFAULT_MODEL[provider];
   const isInteractive = values.interactive;
   const sessionId = values.session;
@@ -45587,7 +45538,7 @@ async function execCommand(args) {
 async function execJsonStream(values, positionals, projectPath) {
   const sessionId = values["session-id"] ?? values.session ?? randomUUID2();
   const execSettings = new SettingsManager(projectPath).load();
-  const provider = resolveProvider3(values.provider || execSettings.provider);
+  const provider = resolveProvider4(values.provider || execSettings.provider);
   const model = values.model || execSettings.model || DEFAULT_MODEL[provider];
   const renderer = new JsonStreamRenderer({
     sessionId,
@@ -45757,7 +45708,7 @@ async function indexCommand(args) {
   const projectPath = values.dir || process.cwd();
   requireInitialization(projectPath, "index");
   new ConfigManager(projectPath).updateVersion(VERSION2);
-  const provider = resolveProvider3(values.provider);
+  const provider = resolveProvider4(values.provider);
   const model = values.model || DEFAULT_MODEL[provider];
   const aiRunner = createAiRunner(provider, {
     projectPath,
@@ -45848,13 +45799,12 @@ async function initCommand() {
 init_plan();
 
 // src/commands/review.ts
+init_src3();
 init_index_node();
 init_config_manager();
-init_settings_manager();
 init_utils3();
-init_workspace_resolver();
-import { existsSync as existsSync19, mkdirSync as mkdirSync9, writeFileSync as writeFileSync8 } from "node:fs";
-import { join as join19 } from "node:path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync9, writeFileSync as writeFileSync9 } from "node:fs";
+import { join as join20 } from "node:path";
 import { parseArgs as parseArgs7 } from "node:util";
 async function reviewCommand(args) {
   const subcommand = args[0];
@@ -45880,41 +45830,25 @@ async function reviewPrsCommand(args) {
   requireInitialization(projectPath, "review");
   const configManager = new ConfigManager(projectPath);
   configManager.updateVersion(VERSION2);
-  const settingsManager = new SettingsManager(projectPath);
-  const settings = settingsManager.load();
-  const apiKey = values["api-key"] || settings.apiKey;
-  if (!apiKey) {
-    console.error(c.error("Error: API key is required for PR review"));
-    console.error(c.dim(`Configure with: locus config setup --api-key <key>
-  Or pass --api-key flag`));
-    console.error(c.dim("For local staged-changes review, use: locus review local"));
-    process.exit(1);
-  }
-  const provider = resolveProvider3(values.provider || settings.provider);
-  const model = values.model || settings.model || DEFAULT_MODEL[provider];
-  const apiBase = values["api-url"] || settings.apiUrl || "https://api.locusai.dev/api";
-  let workspaceId;
+  let apiContext;
   try {
-    const resolver = new WorkspaceResolver({
-      apiKey,
-      apiBase,
+    apiContext = await resolveApiContext({
+      projectPath,
+      apiKey: values["api-key"],
+      apiUrl: values["api-url"],
       workspaceId: values.workspace
     });
-    workspaceId = await resolver.resolve();
   } catch (error48) {
     console.error(c.error(error48 instanceof Error ? error48.message : String(error48)));
+    console.error(c.dim("For local staged-changes review, use: locus review local"));
     process.exit(1);
   }
-  const log = (msg, level = "info") => {
-    const colorFn = {
-      info: c.cyan,
-      success: c.green,
-      warn: c.yellow,
-      error: c.red
-    }[level];
-    const prefix = { info: "ℹ", success: "✓", warn: "⚠", error: "✗" }[level];
-    console.log(`  ${colorFn(`${prefix} ${msg}`)}`);
-  };
+  const { provider, model } = resolveAiSettings({
+    projectPath,
+    provider: values.provider,
+    model: values.model
+  });
+  const log = createCliLogger();
   const prService = new PrService(projectPath, log);
   const unreviewedPrs = prService.listUnreviewedLocusPrs();
   if (unreviewedPrs.length === 0) {
@@ -45929,10 +45863,10 @@ async function reviewPrsCommand(args) {
   const agentId = `reviewer-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
   const reviewer = new ReviewerWorker({
     agentId,
-    workspaceId,
-    apiBase,
+    workspaceId: apiContext.workspaceId,
+    apiBase: apiContext.apiBase,
     projectPath,
-    apiKey,
+    apiKey: apiContext.apiKey,
     model,
     provider
   });
@@ -45961,9 +45895,11 @@ async function reviewLocalCommand(args) {
   });
   const projectPath = values.dir || process.cwd();
   requireInitialization(projectPath, "review local");
-  const localSettings = new SettingsManager(projectPath).load();
-  const provider = resolveProvider3(values.provider || localSettings.provider);
-  const model = values.model || localSettings.model || DEFAULT_MODEL[provider];
+  const { provider, model } = resolveAiSettings({
+    projectPath,
+    provider: values.provider,
+    model: values.model
+  });
   const aiRunner = createAiRunner(provider, {
     projectPath,
     model
@@ -45971,18 +45907,7 @@ async function reviewLocalCommand(args) {
   const reviewService = new ReviewService({
     aiRunner,
     projectPath,
-    log: (msg, level) => {
-      switch (level) {
-        case "error":
-          console.log(`  ${c.error("✖")} ${msg}`);
-          break;
-        case "success":
-          console.log(`  ${c.success("✔")} ${msg}`);
-          break;
-        default:
-          console.log(`  ${c.dim(msg)}`);
-      }
-    }
+    log: createCliLogger()
   });
   console.log(`
   ${c.primary("\uD83D\uDD0D")} ${c.bold("Reviewing staged changes...")}
@@ -45993,13 +45918,13 @@ async function reviewLocalCommand(args) {
 `);
     return;
   }
-  const reviewsDir = join19(projectPath, LOCUS_CONFIG.dir, LOCUS_CONFIG.reviewsDir);
-  if (!existsSync19(reviewsDir)) {
+  const reviewsDir = join20(projectPath, LOCUS_CONFIG.dir, LOCUS_CONFIG.reviewsDir);
+  if (!existsSync20(reviewsDir)) {
     mkdirSync9(reviewsDir, { recursive: true });
   }
   const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
-  const reportPath = join19(reviewsDir, `review-${timestamp}.md`);
-  writeFileSync8(reportPath, report, "utf-8");
+  const reportPath = join20(reviewsDir, `review-${timestamp}.md`);
+  writeFileSync9(reportPath, report, "utf-8");
   console.log(`
   ${c.success("✔")} ${c.success("Review complete!")}`);
   console.log(`  ${c.dim("Report saved to:")} ${c.primary(reportPath)}
@@ -46008,10 +45933,23 @@ async function reviewLocalCommand(args) {
 // src/commands/run.ts
 init_index_node();
 init_config_manager();
-init_settings_manager();
-init_utils3();
-init_workspace_resolver();
 import { parseArgs as parseArgs8 } from "node:util";
+init_utils3();
+
+// src/workspace-resolver.ts
+init_src3();
+init_index_node();
+
+class WorkspaceResolver2 extends WorkspaceResolver {
+  constructor(options) {
+    super({
+      ...options,
+      log: (msg) => console.log(c.dim(`ℹ  ${msg}`))
+    });
+  }
+}
+
+// src/commands/run.ts
 async function runCommand(args) {
   const { values } = parseArgs8({
     args,
@@ -46042,11 +45980,11 @@ async function runCommand(args) {
     process.exit(1);
   }
   let workspaceId = values.workspace;
-  const provider = resolveProvider3(values.provider || settings.provider);
+  const provider = resolveProvider4(values.provider || settings.provider);
   const model = values.model || settings.model || DEFAULT_MODEL[provider];
   const apiBase = values["api-url"] || settings.apiUrl || "https://api.locusai.dev/api";
   try {
-    const resolver = new WorkspaceResolver({
+    const resolver = new WorkspaceResolver2({
       apiKey,
       apiBase,
       workspaceId: values.workspace
@@ -46094,10 +46032,9 @@ ${c.info(`Received ${signal}. Stopping agent and cleaning up...`)}`);
 }
 // src/commands/telegram.ts
 init_index_node();
-init_settings_manager();
 import { spawn as spawn4 } from "node:child_process";
-import { existsSync as existsSync20 } from "node:fs";
-import { join as join20 } from "node:path";
+import { existsSync as existsSync21 } from "node:fs";
+import { join as join21 } from "node:path";
 import { createInterface as createInterface2 } from "node:readline";
 function ask2(question) {
   const rl = createInterface2({
@@ -46331,8 +46268,8 @@ function runBotCommand(projectPath) {
 `);
     process.exit(1);
   }
-  const monorepoTelegramEntry = join20(projectPath, "packages/telegram/src/index.ts");
-  const isMonorepo = existsSync20(monorepoTelegramEntry);
+  const monorepoTelegramEntry = join21(projectPath, "packages/telegram/src/index.ts");
+  const isMonorepo = existsSync21(monorepoTelegramEntry);
   let cmd;
   let args;
   if (isMonorepo) {