omnara 0.5.2 → 0.6.0

package/dist/cli.js

@@ -21,8 +21,128 @@ import "@anthropic-ai/claude-agent-sdk";
 import fs from "fs";
 import * as Sentry from "@sentry/node";
 import {
-  query
+  query as query2
 } from "@anthropic-ai/claude-agent-sdk";
+
+// src/utils/claude-code-check.ts
+import chalk from "chalk";
+import { query } from "@anthropic-ai/claude-agent-sdk";
+import { execSync } from "child_process";
+
+// src/utils/executable.ts
+function isBunSingleFileExecutable() {
+  const arg1 = process.argv[1] ?? "";
+  return arg1.startsWith("/$bunfs/");
+}
+function getSpawnArgs(commandArgs) {
+  if (isBunSingleFileExecutable()) {
+    return commandArgs;
+  }
+  const scriptPath = process.argv[1] ?? "";
+  return [scriptPath, ...commandArgs];
+}
+function getExecutablePath() {
+  return process.execPath;
+}
+
+// src/utils/claude-code-check.ts
+function claudeExecutablePath() {
+  if (!isBunSingleFileExecutable()) {
+    return {};
+  }
+  try {
+    const command = process.platform === "win32" ? "where claude" : "which claude";
+    const result = execSync(command, { encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] });
+    const foundPath = result.trim().split("\n")[0];
+    if (foundPath) {
+      return { pathToClaudeCodeExecutable: foundPath };
+    }
+  } catch {
+  }
+  console.error(
+    "[Omnara] Claude Code executable not found in PATH. Please ensure Claude Code is installed: https://claude.ai/download"
+  );
+  return {};
+}
+async function performClaudeCodeCheck() {
+  if (process.env.OMNARA_SKIP_CLAUDE_CHECK === "true") {
+    return true;
+  }
+  const indicator = createClaudeCheckIndicator();
+  try {
+    indicator?.start();
+    for await (const message of query({
+      prompt: "Respond with one word.",
+      options: {
+        maxTurns: 1,
+        model: "haiku",
+        settingSources: ["user", "project", "local"],
+        // Required for Bun single-file executable compatibility
+        ...claudeExecutablePath()
+      }
+    })) {
+      void message;
+    }
+    indicator?.stop("ok");
+    return true;
+  } catch {
+    indicator?.stop("fail");
+    console.log(
+      chalk.red(
+        "\nError: Omnara couldn't run because it relies on Claude Code, which isn't installed or authenticated. Try running `claude /login`.\n"
+      )
+    );
+    return false;
+  }
+}
+function createClaudeCheckIndicator() {
+  if (!process.stdout.isTTY) {
+    return {
+      start() {
+        console.log("Checking Claude Code auth...");
+      },
+      stop(status) {
+        if (status !== "ok") {
+          console.log("Claude Code auth failed.");
+        }
+      }
+    };
+  }
+  const label = "Checking Claude Code auth";
+  const frames = ["-", "\\", "|", "/"];
+  let index = 0;
+  let interval = null;
+  let running = false;
+  const stopLine = (status) => {
+    if (!running) {
+      return;
+    }
+    running = false;
+    if (interval) {
+      clearInterval(interval);
+    }
+    const statusText = status === "ok" ? chalk.green("OK") : chalk.red("FAILED");
+    const padding = "   ";
+    process.stdout.write(`\r${label} ${statusText}${padding}
+`);
+  };
+  return {
+    start() {
+      if (running) {
+        return;
+      }
+      running = true;
+      process.stdout.write(`${label} ...`);
+      interval = setInterval(() => {
+        process.stdout.write(`\r${label} ${frames[index]}  `);
+        index = (index + 1) % frames.length;
+      }, 120);
+    },
+    stop: stopLine
+  };
+}
+
+// src/orchestrator/ai-client.ts
 var MODEL_MAP = {
   haiku: "claude-haiku-4-5-20251001",
   sonnet: "claude-sonnet-4-5-20250929",
@@ -57,9 +177,11 @@ var BASE_ALLOWED_WORKER_TOOLS = [
   "Skill",
   "SlashCommand"
 ];
+var INTERRUPT_TIMEOUT_MS = 5e3;
 var AIClient = class {
   baseOptions;
   query;
+  abortController;
   currentModel = "sonnet";
   constructor(config) {
     const defaultOptions = {
@@ -68,7 +190,9 @@ var AIClient = class {
       cwd: process.cwd(),
       includePartialMessages: false,
       allowedTools: [...BASE_ALLOWED_ORCHESTRATOR_TOOLS],
-      settingSources: ["user", "project", "local"]
+      settingSources: ["user", "project", "local"],
+      // Required for Bun single-file executable compatibility
+      ...claudeExecutablePath()
     };
     this.baseOptions = {
       ...defaultOptions,
@@ -80,29 +204,50 @@ var AIClient = class {
     this.ensureWorkingDirectory(this.baseOptions.cwd);
   }
   async *streamUserMessage(prompt2, overrides) {
+    this.abortController = new AbortController();
     const q = this.createQuery(prompt2, overrides);
     this.query = q;
-    for await (const message of q) {
-      yield message;
+    try {
+      for await (const message of q) {
+        yield message;
+      }
+    } finally {
+      this.query = void 0;
+      this.abortController = void 0;
     }
-    this.query = void 0;
   }
   createQuery(prompt2, overrides) {
     const merged = {
       ...this.baseOptions,
-      ...overrides
+      ...overrides,
+      abortController: this.abortController
     };
     this.ensureWorkingDirectory(merged.cwd);
-    return query({
+    return query2({
       prompt: prompt2,
       options: merged
     });
   }
   async cancel() {
-    if (this.query) {
-      await this.query.interrupt();
-    } else {
-      console.warn("No query to interrupt. Ignoring");
+    if (!this.query) {
+      console.warn("[AIClient] No query to interrupt. Ignoring");
+      return;
+    }
+    try {
+      const interruptPromise = this.query.interrupt();
+      const timeoutPromise = new Promise(
+        (resolve) => setTimeout(() => resolve("timeout"), INTERRUPT_TIMEOUT_MS)
+      );
+      const result = await Promise.race([interruptPromise, timeoutPromise]);
+      if (result === "timeout") {
+        console.warn(
+          `[AIClient] interrupt() timed out after ${INTERRUPT_TIMEOUT_MS}ms, falling back to abort`
+        );
+        this.abortController?.abort();
+      }
+    } catch (error) {
+      console.warn("[AIClient] interrupt() failed, falling back to abort:", error);
+      this.abortController?.abort();
     }
   }
   isGenerating() {
@@ -156,7 +301,7 @@ import { simpleGit as simpleGit2 } from "simple-git";
 
 // src/orchestrator/session.ts
 import {
-  query as query2
+  query as query3
 } from "@anthropic-ai/claude-agent-sdk";
 import { setTimeout as delay } from "node:timers/promises";
 
@@ -480,8 +625,22 @@ function createEnvelope(sessionId, content, senderId, metadata, payloadMetadata)
 }
 function toMessageEnvelopes(message, sessionId) {
   const envelopes = [];
+  const messageAny = message;
+  const subagentSessionId = typeof messageAny.session_id === "string" ? messageAny.session_id : void 0;
+  const parentToolUseId = typeof messageAny.parent_tool_use_id === "string" ? messageAny.parent_tool_use_id : void 0;
+  const buildSubagentPayloadMetadata = () => {
+    const metadata = {};
+    if (parentToolUseId) {
+      metadata.parent_tool_use_id = parentToolUseId;
+    }
+    if (subagentSessionId && subagentSessionId !== sessionId) {
+      metadata.subagent_session_id = subagentSessionId;
+    }
+    return Object.keys(metadata).length > 0 ? metadata : void 0;
+  };
   switch (message.type) {
     case "assistant": {
+      const subagentMetadata = buildSubagentPayloadMetadata();
       for (const block of message.message.content) {
         if (isTextBlock(block)) {
           const content = {
@@ -489,9 +648,15 @@ function toMessageEnvelopes(message, sessionId) {
             text: block.text
           };
           envelopes.push(
-            createEnvelope(sessionId, content, sessionId, {
-              role: "assistant"
-            })
+            createEnvelope(
+              sessionId,
+              content,
+              sessionId,
+              {
+                role: "assistant"
+              },
+              subagentMetadata
+            )
           );
         } else if (isToolUseBlock(block)) {
           const content = {
@@ -501,15 +666,29 @@ function toMessageEnvelopes(message, sessionId) {
             arguments: normalizeToolArguments(block.input)
           };
           envelopes.push(
-            createEnvelope(sessionId, content, sessionId, {
-              role: "assistant"
-            })
+            createEnvelope(
+              sessionId,
+              content,
+              sessionId,
+              {
+                role: "assistant"
+              },
+              subagentMetadata
+            )
           );
         }
       }
       break;
     }
     case "user": {
+      if (parentToolUseId) {
+        break;
+      }
+      const firstBlock = message.message.content[0];
+      if (isTextBlock(firstBlock) && (firstBlock.text === "[Request interrupted by user]" || firstBlock.text === "[Request interrupted by user for tool use]")) {
+        break;
+      }
+      const subagentMetadata = buildSubagentPayloadMetadata();
       for (const block of message.message.content) {
         if (isToolResultBlock(block)) {
           const content = {
@@ -519,9 +698,15 @@ function toMessageEnvelopes(message, sessionId) {
             is_error: Boolean(block.is_error)
           };
           envelopes.push(
-            createEnvelope(sessionId, content, sessionId, {
-              role: "assistant"
-            })
+            createEnvelope(
+              sessionId,
+              content,
+              sessionId,
+              {
+                role: "assistant"
+              },
+              subagentMetadata
+            )
           );
         } else if (isTextBlock(block)) {
           const content = {
@@ -529,9 +714,15 @@ function toMessageEnvelopes(message, sessionId) {
             text: block.text
           };
           envelopes.push(
-            createEnvelope(sessionId, content, sessionId, {
-              role: "user"
-            })
+            createEnvelope(
+              sessionId,
+              content,
+              sessionId,
+              {
+                role: "user"
+              },
+              subagentMetadata
+            )
           );
         }
       }
@@ -544,6 +735,13 @@ function toMessageEnvelopes(message, sessionId) {
           type: "text",
           text: delta
         };
+        const streamPayloadMetadata = {
+          stream_delta: true
+        };
+        const subagentMeta = buildSubagentPayloadMetadata();
+        if (subagentMeta) {
+          Object.assign(streamPayloadMetadata, subagentMeta);
+        }
         envelopes.push(
           createEnvelope(
             sessionId,
@@ -552,9 +750,7 @@ function toMessageEnvelopes(message, sessionId) {
             {
               role: "assistant"
             },
-            {
-              stream_delta: true
-            }
+            streamPayloadMetadata
           )
         );
       }
@@ -661,6 +857,7 @@ var Session = class {
   sessionInitSubscribers = [];
   queue = [];
   generating = false;
+  waitingForMessage = null;
   announcementPromise = null;
   announced = false;
   shouldSummarize = false;
@@ -682,19 +879,29 @@ var Session = class {
       sessionId: this.id,
       queueLength: this.queue.length
     });
-    if (!this.generating && !this.ai.isGenerating()) {
+    if (this.waitingForMessage) {
+      const resolver = this.waitingForMessage;
+      this.waitingForMessage = null;
+      const batch = this.queue.splice(0, this.queue.length);
+      void this.emitProgress("running", "Generating response");
+      resolver(batch);
+    } else if (!this.generating && !this.ai.isGenerating()) {
       this.startGenerate();
     }
   }
   async *[Symbol.asyncIterator]() {
     while (true) {
-      if (this.queue.length === 0) {
-        logger.debug("[Session] Emptied queue", {
+      let batch;
+      if (this.queue.length > 0) {
+        batch = this.queue.splice(0, this.queue.length);
+      } else {
+        logger.debug("[Session] Iterator waiting for messages", {
           sessionId: this.id
         });
-        return;
+        batch = await new Promise((resolve) => {
+          this.waitingForMessage = resolve;
+        });
       }
-      const batch = this.queue.splice(0, this.queue.length);
       logger.debug("[Session] Yielding batch to SDK", {
         sessionId: this.id,
         batchSize: batch.length
@@ -727,28 +934,40 @@ var Session = class {
       const summaryTextBlocks = [];
       let resultMessage = null;
       await this.emitProgress("running", "Generating response");
-      for await (const message of this.ai.streamUserMessage(this, {
-        ...this.sdkSessionIdentifier ? { resume: this.sdkSessionIdentifier } : {}
-      })) {
-        this.captureSdkSessionId(message);
-        if (message.type === "assistant") {
-          this.collectAssistantSummaryBlocks(message, summaryTextBlocks);
-        }
-        if (message.type === "result") {
-          resultMessage = message;
+      try {
+        for await (const message of this.ai.streamUserMessage(this, {
+          ...this.sdkSessionIdentifier ? { resume: this.sdkSessionIdentifier } : {}
+        })) {
+          this.captureSdkSessionId(message);
+          if (message.type === "assistant") {
+            this.collectAssistantSummaryBlocks(message, summaryTextBlocks);
+          }
+          if (message.type === "result") {
+            resultMessage = message;
+            this.resetRetryState();
+            const complete = await this.buildCompletionEnvelope(resultMessage, summaryTextBlocks);
+            await Promise.all([
+              this.emitProgress("idle", "Ready for next message"),
+              this.dispatchEnvelope(complete)
+            ]);
+            summaryTextBlocks.length = 0;
+            resultMessage = null;
+          }
+          for (const envelope of toMessageEnvelopes(message, this.id)) {
+            await this.dispatchEnvelope(envelope);
+          }
         }
-        for (const envelope of toMessageEnvelopes(message, this.id)) {
-          await this.dispatchEnvelope(envelope);
+      } catch (error) {
+        if (error instanceof Error && error.name === "AbortError") {
+          logger.info("[Session] Generation aborted", { sessionId: this.id });
+          await this.emitProgress("idle", "Generation cancelled");
+          return;
         }
+        throw error;
       }
-      this.resetRetryState();
-      const complete = await this.buildCompletionEnvelope(resultMessage, summaryTextBlocks);
-      await Promise.all([
-        this.emitProgress("idle", "Ready for next message"),
-        this.dispatchEnvelope(complete)
-      ]);
     } finally {
       this.generating = false;
+      this.waitingForMessage = null;
       logger.debug("[Session] Generation finished", {
         sessionId: this.id,
         pendingMessages: this.queue.length
@@ -868,7 +1087,7 @@ var Session = class {
     }
     const summarizationPrompt = `<assistant-output>${combined}<assistant-output>`;
     let summary = "";
-    for await (const message of query2({
+    for await (const message of query3({
       prompt: summarizationPrompt,
       options: {
         systemPrompt: `Provide a 3-5 sentence summary of the actions taken by the assistant.
@@ -878,7 +1097,8 @@ ONLY include content like key takeaways, actions (do NOT specify by whom), futur
 This content should be sufficient to be inserted into something like a commit message or pull request description.`,
         maxTurns: 1,
         model: "haiku",
-        allowedTools: []
+        allowedTools: [],
+        ...claudeExecutablePath()
       }
     })) {
       if (message.type === "assistant") {
@@ -941,7 +1161,7 @@ This content should be sufficient to be inserted into something like a commit me
     }
     const prompt2 = this.buildCommitMessagePrompt(conversationContext, diff);
     let commitMessage = "";
-    for await (const message of query2({
+    for await (const message of query3({
       prompt: prompt2,
       options: {
         systemPrompt: `You generate clear, concise git commit messages based on conversation context and code changes.
@@ -956,7 +1176,8 @@ Guidelines:
 Return ONLY the commit message, no explanation or markdown formatting.`,
         maxTurns: 1,
         model: "haiku",
-        allowedTools: []
+        allowedTools: [],
+        ...claudeExecutablePath()
       }
     })) {
       if (message.type === "assistant") {
@@ -2016,13 +2237,11 @@ Orchestrator: [message_worker: task="refactor database", message="User wants to
   });
 }
 
-// src/orchestrator/orchestrator-prompt.ts
-import { readFileSync } from "fs";
-var orchestratorPromptUrl = new URL("./orchestrator-prompt.md", import.meta.url);
-var ORCHESTRATOR_SYSTEM_PROMPT = readFileSync(orchestratorPromptUrl, "utf-8");
+// src/orchestrator/orchestrator-prompt.md
+var orchestrator_prompt_default = '# Role: Task Orchestrator\n\nYou are Omnara, an orchestrator agent. Your job is to coordinate work by delegating to worker agents while staying responsive to user interaction.\n\n## The Mental Model\n\n**You stay zoomed out. Workers go zoomed in.**\n\nYou are a coordinator who maintains the big picture. Workers are specialists who dive deep into specific domains. When a worker investigates authentication, they accumulate valuable context about the auth system. That context is an asset - reuse it.\n\n**Context is valuable. Accuracy over speed.**\n\nA worker who already understands a domain will do better work than a fresh worker starting from zero. Always prefer routing work to workers with relevant context over launching new workers.\n\n---\n\n## Tool Restrictions\n\n**FORBIDDEN tools (delegate these to workers):**\n- Write, Edit, Bash, NotebookEdit\n\n**Allowed tools (read-only, use sparingly):**\n- Read, Grep, Glob - For quick lookups (1-2 calls max)\n- WebFetch, WebSearch - For external information\n- TodoWrite - For tracking multi-step tasks\n\n**Why?** Using forbidden tools blocks your context. Workers execute operations without blocking you. Your job is to coordinate, not implement.\n\n---\n\n## The Routing Decision\n\nWhen a user request comes in, follow this decision tree:\n\n```\nNew request arrives\n    |\n    v\nIs there a completed worker whose domain matches this request?\n    |\n    YES --> Route to that worker (message_worker)\n    NO  --> Is there a running worker whose domain matches?\n                |\n                YES --> Queue message to that worker (message_worker, interrupt=false)\n                NO  --> Launch a new worker\n```\n\n**How to identify matching domains:** Check the worker-status in your system prompt and [Automated Worker Summary] messages. They show task names, status, worktree, and completion summaries.\n\n### When to Route to Existing Workers\n\n**Workers evolve over time.** A worker\'s task name reflects what they started with, but they accumulate context as they receive follow-up messages. They may handle related work that wasn\'t part of their original task but shares context. When deciding whether to route to an existing worker, don\'t just match on task name - consider whether the worker has touched relevant files, worked in the same domain, or has context that would be useful even if the new request isn\'t exactly what they originally did.\n\nRoute to an existing worker when:\n- The request involves files/code that worker has touched\n- The request is in the same feature area\n- The request builds on or modifies previous work\n- The user is asking about work a worker did\n- Understanding prior decisions would be valuable\n- **A bug or question comes up related to work a worker previously did** - Message that worker to investigate/fix it instead of investigating yourself or asking the user for direction. The worker has the context and will be more effective.\n\n### When to Launch New Workers\n\nLaunch a new worker only when:\n- No existing worker has relevant context\n- The request is in a completely unrelated domain\n- The user explicitly asks for a separate task\n- Work would conflict with an existing worker\'s activity\n\n### Routing Examples\n\n```\nWorker "auth-impl" previously: Implemented login/logout\n\nUser: "Add password reset"\n--> Message "auth-impl" (same domain, they know the auth system)\n\nUser: "Add dark mode to settings"\n--> Launch new worker (unrelated domain)\n\nUser: "Why did you use JWT instead of sessions?"\n--> Message "auth-impl" (they made that decision)\n```\n\n---\n\n## Using message_worker\n\n**interrupt=false (default):** Queue message for after current work\n- Use for: Follow-up tasks, additional requirements, questions\n\n**interrupt=true:** Stop current work immediately\n- Use only when: User explicitly says stop, or new info contradicts current direction\n\n**Message content should include:**\n- What the user is asking for\n- How it relates to the worker\'s previous work (if not obvious)\n- Any new context from the user\n\n**After messaging:** Don\'t poll with get_workers. You\'ll be automatically notified when the worker completes.\n\n---\n\n## Launching Workers\n\nWhen you do need to launch new workers:\n\n**Provide clear instructions:**\n- What to do\n- What information to return\n- Any relevant context you gathered\n\n**Use worktree_name for isolation:**\n- `worktree_name="feature-x"` creates an isolated git branch\n- Multiple workers with same worktree_name share that branch\n- Different worktree_names = fully isolated work\n- Omit for trivial changes (typos, docs)\n\n**Example delegation:**\n```\nUser: "Add rate limiting to the API"\n\nlaunch_worker with prompt: "Add rate limiting middleware to the API.\nApply globally with 100 requests per 15 minutes.\nDocument the configuration in comments."\nworktree_name: "add-rate-limiting"\n```\n\n---\n\n## Multiple Workers\n\n**Parallel workers are appropriate when:**\n- Tasks are in completely different domains\n- Tasks don\'t depend on each other\'s results\n- Example: "Fix auth bug AND add logging feature" - 2 workers, different worktrees\n\n**Sequential work should reuse the same worker:**\n- "Research auth libraries, then implement" - One worker does both\n- "Implement feature, then add tests" - Same worker continues\n\n**Avoid:** Launching parallel workers for tightly related work. The workers won\'t share context and may make inconsistent decisions.\n\n---\n\n## Worktree Patterns\n\n**Same worktree, same worker (preferred for sequential work):**\n```\nlaunch_worker(worktree_name="feature-x", ...)\n[worker completes]\nmessage_worker(task="feature-x", message="Now do the next step...")\n```\nContext preserved. Worker knows the domain.\n\n**Different worktrees (for unrelated parallel work):**\n```\nlaunch_worker(worktree_name="feature-x", ...)\nlaunch_worker(worktree_name="feature-y", ...)\n```\nFully isolated. Different features/branches.\n\n**Same worktree, different workers (rare - only when you want fresh perspective):**\n```\nlaunch_worker(worktree_name="feature-x", ...)\n[worker completes]\nlaunch_worker(worktree_name="feature-x", ...)  # New worker, context discarded\n```\nUse sparingly. Loses accumulated knowledge.\n\n---\n\n## TodoWrite\n\nUse for multi-step tasks (2+ sequential steps) to give users visibility.\n\n**Todo states:** pending, in_progress, completed\n**Keep exactly ONE todo in_progress at a time.**\n\n```\nUser: "Add OAuth, then test it"\n\nTodoWrite:\n1. "Implement OAuth" - in_progress\n2. "Test OAuth flow" - pending\n\n[Worker completes step 1]\nUpdate: step 1 completed, step 2 in_progress\n```\n\nDon\'t use TodoWrite for single tasks or simple lookups.\n\n---\n\n## Responding to Worker Completions\n\nWhen a worker completes, you receive an [Automated Worker Summary] message containing what the worker accomplished.\n\n**Your response should:**\n1. Report ONLY the new completion (not previously reported ones)\n2. Keep it brief: "The auth worker completed. Login/logout endpoints are implemented."\n3. Note next steps if applicable\n\n**Don\'t:** Re-summarize all workers. Re-explain previous completions. Provide comprehensive recaps unless asked.\n\n---\n\n## Remember\n\n**Your role:** Coordinator, not implementer. Stay zoomed out.\n\n**Tool restrictions:** Never use Write, Edit, Bash, NotebookEdit directly. Always delegate.\n\n**Routing priority:** Existing workers with context > New workers. Context is valuable.\n\n**Accuracy over speed:** One worker with good context beats two workers duplicating effort.\n\n**Stay responsive:** Delegate to keep your context unblocked for user interaction.\n\n**Worker status:** Check worker-status in your system prompt and [Automated Worker Summary] messages. Don\'t poll with get_workers.\n\n**When in doubt:** Route to an existing worker if one has relevant context. Otherwise, delegate to a new worker.\n';
 
 // src/orchestrator/utils/completions-manager.ts
-import { query as query3 } from "@anthropic-ai/claude-agent-sdk";
+import { query as query4 } from "@anthropic-ai/claude-agent-sdk";
 import { glob } from "glob";
 import * as path6 from "path";
 import * as Sentry4 from "@sentry/node";
@@ -2034,9 +2253,14 @@ var CompletionsManager = class {
       return this.slashCommandsCache.slashCommands;
     }
     let commands = [];
-    for await (const message of query3({
+    for await (const message of query4({
       prompt: "Respond with one word.",
-      options: { maxTurns: 1, model: "haiku", settingSources: ["user", "project", "local"] }
+      options: {
+        maxTurns: 1,
+        model: "haiku",
+        settingSources: ["user", "project", "local"],
+        ...claudeExecutablePath()
+      }
     })) {
       if (message.type === "system" && message.subtype === "init") {
         console.log("Fetched available slash commands:", message.slash_commands);
@@ -2269,7 +2493,7 @@ var AgentOrchestrator = class {
         mcpServers: {
           worker: this.workerMcpServer
         },
-        systemPrompt: ORCHESTRATOR_SYSTEM_PROMPT
+        systemPrompt: orchestrator_prompt_default
       }
     }));
     this.aiClient = mainClientFactory();
@@ -2563,6 +2787,33 @@ var AgentOrchestrator = class {
           commit_sha: commitSha
         };
       }
+      if (req.action === "commit_checkout") {
+        try {
+          const currentBranch = await git.revparse(["--abbrev-ref", "HEAD"]);
+          const branchTrimmed = currentBranch.trim();
+          const repoPath = this.workerManager.repoPath;
+          const mainGit = simpleGit2(repoPath);
+          await mainGit.raw(["checkout", "-d", branchTrimmed]);
+          logger2.info(`[AgentOrchestrator] Checked out ${branchTrimmed} in main worktree`);
+          return {
+            type: "git_write",
+            success: true,
+            message: `Committed changes. The main workspace checked out the changes on this branch.`,
+            commit_sha: commitSha
+          };
+        } catch (checkoutError) {
+          logger2.error("[AgentOrchestrator] Failed to checkout in main worktree", {
+            error: checkoutError
+          });
+          return {
+            type: "git_write",
+            success: true,
+            message: `Committed successfully but failed to checkout in main worktree: ${checkoutError instanceof Error ? checkoutError.message : String(checkoutError)}`,
+            commit_sha: commitSha,
+            error: `Checkout failed: ${checkoutError instanceof Error ? checkoutError.message : String(checkoutError)}`
+          };
+        }
+      }
       return {
         type: "git_write",
         success: true,
@@ -3022,7 +3273,7 @@ var AgentOrchestrator = class {
     const statusSnippet = this.buildCurrentWorkerStatus();
     return `${statusSnippet}
 
-${ORCHESTRATOR_SYSTEM_PROMPT}`;
+${orchestrator_prompt_default}`;
   }
   buildCurrentWorkerStatus() {
     const workers = this.workerManager.listWorkers();
@@ -3090,7 +3341,7 @@ function extractSummary(complete) {
 // src/relay/relay-bridge.ts
 import { randomUUID as randomUUID5 } from "crypto";
 import EventEmitter from "events";
-import WebSocket from "ws";
+import WebSocket2 from "ws";
 import { simpleGit as simpleGit3 } from "simple-git";
 import * as Sentry11 from "@sentry/node";
 
@@ -3526,7 +3777,7 @@ var control_message_schema_default = {
     },
     GitWriteRequest: {
       additionalProperties: false,
-      description: 'Request to commit and optionally push changes.\n\nThe action field specifies what operation to perform:\n- "commit": Create a git commit with a generated message\n- "commit_push": Create a commit and push to origin\n- "commit_push_pr": Create a commit, push, and create a PR (not yet implemented)',
+      description: 'Request to commit and optionally push changes.\n\nThe action field specifies what operation to perform:\n- "commit": Create a git commit with a generated message\n- "commit_push": Create a commit and push to origin\n- "commit_push_pr": Create a commit, push, and create a PR (not yet implemented)\n- "commit_checkout": Create a commit and checkout the branch in the main worktree',
       properties: {
         type: {
           const: "git_write",
@@ -3538,7 +3789,8 @@ var control_message_schema_default = {
           enum: [
             "commit",
             "commit_push",
-            "commit_push_pr"
+            "commit_push_pr",
+            "commit_checkout"
           ],
           title: "Action",
           type: "string"
@@ -4620,12 +4872,23 @@ var machine_message_schema_default = {
           type: "string"
         },
         method: {
-          const: "start_session",
+          enum: [
+            "start_session",
+            "stop_session"
+          ],
           title: "Method",
           type: "string"
         },
         payload: {
-          $ref: "#/$defs/MachineStartSessionPayload"
+          anyOf: [
+            {
+              $ref: "#/$defs/MachineStartSessionPayload"
+            },
+            {
+              $ref: "#/$defs/MachineStopSessionPayload"
+            }
+          ],
+          title: "Payload"
         }
       },
       required: [
@@ -4799,6 +5062,22 @@ var machine_message_schema_default = {
       title: "MachineStatus",
       type: "string"
     },
+    MachineStopSessionPayload: {
+      additionalProperties: false,
+      description: "Payload instructing the daemon to terminate a running session.",
+      properties: {
+        user_session_id: {
+          format: "uuid",
+          title: "User Session Id",
+          type: "string"
+        }
+      },
+      required: [
+        "user_session_id"
+      ],
+      title: "MachineStopSessionPayload",
+      type: "object"
+    },
     WorkspaceConfig: {
       additionalProperties: false,
       description: "Workspace-level configuration persisted alongside metadata.",
@@ -7487,7 +7766,7 @@ function tryOpenBrowser(url) {
 }
 
 // src/auth/login-flow.ts
-import chalk from "chalk";
+import chalk2 from "chalk";
 async function performVerificationLogin({
   backendUrlOption,
   frontendUrlOption,
@@ -7496,7 +7775,7 @@ async function performVerificationLogin({
   const backendUrl = resolveBackendUrl(backendUrlOption);
   const frontendUrl = resolveFrontendUrl(frontendUrlOption);
   const client = new ApiClient({ baseUrl: backendUrl });
-  console.log(chalk.yellow("Authenticating CLI\u2026"));
+  console.log(chalk2.yellow("Authenticating CLI\u2026"));
   const loopback = await LoopbackListener.create();
   const pkce = loopback ? generatePkcePair() : null;
   const sessionOptions = {
@@ -7529,7 +7808,7 @@ async function performVerificationLogin({
     await store.save(updated);
     latestCredentials = updated;
     if (!successLogged) {
-      console.log(chalk.green("\n\nLogin successful. Credentials saved."));
+      console.log(chalk2.green("\n\nLogin successful. Credentials saved."));
       successLogged = true;
     }
     completed = true;
@@ -7545,7 +7824,7 @@ async function performVerificationLogin({
   }
   while (!completed) {
     const input2 = await prompt(
-      chalk.gray("\nInput fallback code if automatic login doesn't complete: ")
+      chalk2.gray("\nInput fallback code if automatic login doesn't complete: ")
     );
     const cleaned = input2.trim();
     if (completed) {
@@ -7618,10 +7897,10 @@ function reportLoopbackError(error) {
 }
 function printSessionInstructions(session) {
   console.log(
-    chalk.blue.bold("\nOpen this link in your browser if it did not open automatically:")
+    chalk2.blue.bold("\nOpen this link in your browser if it did not open automatically:")
   );
-  console.log(chalk.blueBright.underline(`${session.verificationUriComplete}`));
-  console.log(chalk.blue("\nApprove the request, then return to the CLI."));
+  console.log(chalk2.blueBright.underline(`${session.verificationUriComplete}`));
+  console.log(chalk2.blue("\nApprove the request, then return to the CLI."));
 }
 function extractErrorMessage4(error) {
   if (error instanceof Error && error.message) {
@@ -7729,6 +8008,27 @@ async function ensureUserSession(client, accessToken, options) {
   );
 }
 
+// src/utils/websocket.ts
+import WebSocket from "ws";
+function safeCloseWebSocket(ws) {
+  try {
+    ws.once("error", () => {
+    });
+    if (ws.readyState === WebSocket.CONNECTING) {
+      ws.terminate();
+    } else if (ws.readyState === WebSocket.OPEN) {
+      ws.close();
+    }
+  } catch {
+  }
+  setImmediate(() => {
+    try {
+      ws.removeAllListeners();
+    } catch {
+    }
+  });
+}
+
 // src/relay/relay-bridge.ts
 var MAX_QUEUE_SIZE = 500;
 var LOGIN_WAIT_DELAY_MS = 3e4;
@@ -7773,7 +8073,7 @@ var RelayBridge = class extends EventEmitter {
       throw new Error("Relay bridge already started");
     }
     this.connectionHandle = this.orchestrator.addClient({
-      canSend: () => !this.canceled && this.ws?.readyState === WebSocket.OPEN,
+      canSend: () => !this.canceled && this.ws?.readyState === WebSocket2.OPEN,
       sendEnvelope: async (message) => {
         this.sendFrame(message);
       },
@@ -7830,7 +8130,7 @@ var RelayBridge = class extends EventEmitter {
       this.connectionHandle.disconnect();
       this.connectionHandle = null;
     }
-    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+    if (this.ws && this.ws.readyState === WebSocket2.OPEN) {
       this.ws.close(1e3, "CLI shutting down");
     }
     this.ws = null;
@@ -7847,7 +8147,7 @@ var RelayBridge = class extends EventEmitter {
     this.userSessionId = registration.userSessionId;
     const agentSessionId = this.ensureAgentSessionExists();
     const url = buildRelayWebsocketUrl(this.backendUrl, registration.relayWsPath);
-    const ws = new WebSocket(url, {
+    const ws = new WebSocket2(url, {
       headers: {
         "x-relay-token": registration.relayToken
       }
@@ -7932,7 +8232,7 @@ var RelayBridge = class extends EventEmitter {
     }
     const serialized = JSON.stringify(frame);
     const target = socket ?? this.ws;
-    if (target && target.readyState === WebSocket.OPEN) {
+    if (target && target.readyState === WebSocket2.OPEN) {
       try {
         target.send(serialized);
         return;
@@ -8327,7 +8627,7 @@ var RelayBridge = class extends EventEmitter {
         };
     }
     const socket = this.ws;
-    if (!socket || socket.readyState !== WebSocket.OPEN) {
+    if (!socket || socket.readyState !== WebSocket2.OPEN) {
       return;
     }
     const frame = {
@@ -8398,7 +8698,7 @@ var RelayBridge = class extends EventEmitter {
     this.sendFrame(frame);
   }
   flushQueue() {
-    if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
+    if (!this.ws || this.ws.readyState !== WebSocket2.OPEN) {
       return;
     }
     while (this.pendingOutbound.length > 0) {
@@ -8424,7 +8724,7 @@ var RelayBridge = class extends EventEmitter {
     const interval = Math.max(this.heartbeatIntervalMs, 5e3);
     this.pingTimer = setInterval(() => {
       const socket = this.ws;
-      if (!socket || socket.readyState !== WebSocket.OPEN) {
+      if (!socket || socket.readyState !== WebSocket2.OPEN) {
         return;
       }
       const frame = {
@@ -8442,7 +8742,7 @@ var RelayBridge = class extends EventEmitter {
     }
   }
   closeCurrentSocket() {
-    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+    if (this.ws && this.ws.readyState === WebSocket2.OPEN) {
       this.ws.close(1012, "Reconnecting");
     }
   }
@@ -8495,14 +8795,7 @@ function waitForOpen(ws) {
     const settle = (error) => {
       cleanup();
       if (error) {
-        try {
-          if (ws.readyState === WebSocket.CONNECTING) {
-            ws.terminate();
-          } else if (ws.readyState === WebSocket.OPEN) {
-            ws.close();
-          }
-        } catch {
-        }
+        safeCloseWebSocket(ws);
         reject(error);
       } else {
         resolve();
@@ -9063,7 +9356,7 @@ function extractErrorMessage8(error) {
 }
 
 // src/daemon/daemon-launcher.ts
-import chalk2 from "chalk";
+import chalk3 from "chalk";
 
 // src/daemon/session-pid-registry.ts
 import fs10 from "node:fs/promises";
@@ -9257,7 +9550,7 @@ async function ensureMachineNameConfigured(configStore, logger3) {
   const defaultName = os4.hostname();
   let machineName = defaultName;
   if (process.stdin.isTTY && process.stdout.isTTY) {
-    const answer = (await prompt(chalk2.blue(`Enter a name for this machine [${defaultName}]: `))).trim();
+    const answer = (await prompt(chalk3.blue(`Enter a name for this machine [${defaultName}]: `))).trim();
     if (answer) {
       machineName = answer;
     }
@@ -9450,12 +9743,11 @@ async function registerDirectory(directoryPath, options) {
   await registry.ensureDirectory(normalized, { label: options.label, updateLastUsed: true });
 }
 async function spawnDaemonProcess(options, logger3) {
-  const entry = process.argv[1];
-  if (!entry) {
-    throw new Error("Unable to determine CLI entry path for daemon start");
-  }
+  const args = getSpawnArgs(["daemon", "run-service"]);
+  const execPath = getExecutablePath();
   logger3.info("Starting Omnara daemon...");
-  const child = spawn2(process.execPath, [entry, "daemon", "run-service"], {
+  logger3.debug(`Spawning daemon: ${execPath} ${args.join(" ")}`);
+  const child = spawn2(execPath, args, {
     detached: true,
     stdio: "ignore",
     env: {
@@ -9546,10 +9838,10 @@ function extractErrorMessage10(error) {
 
 // src/commands/daemon.ts
 import { Command as Command2 } from "commander";
-import * as Sentry24 from "@sentry/node";
+import * as Sentry25 from "@sentry/node";
 
 // src/daemon/run-daemon.ts
-import * as Sentry23 from "@sentry/node";
+import * as Sentry24 from "@sentry/node";
 
 // src/daemon/daemon-service.ts
 import * as Sentry22 from "@sentry/node";
@@ -9768,8 +10060,8 @@ function extractErrorMessage11(error) {
 // src/daemon/machine-supervisor.ts
 import { randomUUID as randomUUID7 } from "node:crypto";
 import os5 from "node:os";
-import { setTimeout as delay4 } from "node:timers/promises";
-import WebSocket2 from "ws";
+import { setTimeout as delay5 } from "node:timers/promises";
+import WebSocket3 from "ws";
 import * as Sentry21 from "@sentry/node";
 
 // ../shared-js/dist/utils/eff_wordlist.json
@@ -17595,9 +17887,11 @@ async function ensureWorkspace(client, accessToken, payload) {
 
 // src/daemon/session-runner.ts
 import { spawn as spawn3 } from "node:child_process";
+import { setTimeout as delay4 } from "node:timers/promises";
 import * as Sentry20 from "@sentry/node";
 import fs11 from "node:fs";
 import path13 from "node:path";
+var GRACEFUL_STOP_DELAY_MS = 2e3;
 var SessionManager = class {
   backendUrl;
   frontendUrl;
@@ -17630,6 +17924,47 @@ var SessionManager = class {
       throw error;
     }
   }
+  /**
+   * Stop a running session by user session ID.
+   *
+   * Looks up the session in the PID registry, sends SIGTERM for graceful
+   * shutdown, waits briefly, then sends SIGKILL if still alive.
+   *
+   * @returns true if a running session was found and terminated, false if
+   *          the session was not running.
+   */
+  async stopSession(userSessionId) {
+    return await withSessionRegistry(async (registry) => {
+      const record = registry[userSessionId];
+      if (!record) {
+        return [registry, false];
+      }
+      const alive = await isSessionProcessAlive(record);
+      if (!alive) {
+        delete registry[userSessionId];
+        return [registry, false];
+      }
+      try {
+        process.kill(record.pid, "SIGTERM");
+        this.logger.debug(`Sent SIGTERM to session ${userSessionId} (pid ${record.pid})`);
+      } catch (error) {
+        this.logger.debug(`SIGTERM failed for pid ${record.pid}: ${String(error)}`);
+        delete registry[userSessionId];
+        return [registry, false];
+      }
+      await delay4(GRACEFUL_STOP_DELAY_MS);
+      const stillAlive = await isProcessAlive3(record.pid);
+      if (stillAlive) {
+        try {
+          process.kill(record.pid, "SIGKILL");
+          this.logger.debug(`Sent SIGKILL to session ${userSessionId} (pid ${record.pid})`);
+        } catch {
+        }
+      }
+      delete registry[userSessionId];
+      return [registry, true];
+    });
+  }
 };
 var SessionRunner = class {
   spec;
@@ -17651,10 +17986,6 @@ var SessionRunner = class {
     if (this.child) {
       throw new Error("Session runner already started");
     }
-    const entry = process.argv[1];
-    if (!entry) {
-      throw new Error("Unable to determine CLI entry path for session runner");
-    }
     const sessionLogPath = await createSessionLogPath(this.spec.workspaceId, this.spec.launchId);
     this.logger.info(`Session ${this.spec.launchId} logs available at ${sessionLogPath}`);
     await withSessionRegistry(async (registry) => {
@@ -17668,8 +17999,8 @@ var SessionRunner = class {
       }
       return [registry, null];
     });
-    const args = [
-      entry,
+    const execPath = getExecutablePath();
+    const args = getSpawnArgs([
       "daemon",
       "run-session",
       "--user-session-id",
@@ -17678,7 +18009,8 @@ var SessionRunner = class {
       this.spec.workspaceId,
       "--directory",
       this.directory.path
-    ];
+    ]);
+    this.logger.debug(`Spawning session: ${execPath} ${args.join(" ")}`);
     if (this.spec.worktreeName) {
       args.push("--worktree-name", this.spec.worktreeName);
     }
@@ -17703,7 +18035,7 @@ var SessionRunner = class {
     let logFd = null;
     try {
       logFd = fs11.openSync(sessionLogPath, "a");
-      const child = spawn3(process.execPath, args, {
+      const child = spawn3(execPath, args, {
         cwd: this.directory.path,
         stdio: ["ignore", logFd, logFd],
         env,
@@ -17722,7 +18054,7 @@ var SessionRunner = class {
         this.child = null;
       });
       const startedAt = (/* @__PURE__ */ new Date()).toISOString();
-      const command = `${process.execPath} ${args.join(" ")}`;
+      const command = `${execPath} ${args.join(" ")}`;
       await withSessionRegistry(async (registry) => {
         registry[this.spec.userSessionId] = {
           pid: child.pid ?? -1,
@@ -17762,15 +18094,9 @@ async function createSessionLogPath(workspaceId, launchId) {
 }
 
 // src/package-info.ts
-import { createRequire } from "node:module";
-var require2 = createRequire(import.meta.url);
-var pkg = require2("../package.json");
-var FALLBACK_NAME = pkg.name ?? "omnara";
-var FALLBACK_VERSION = pkg.version ?? "0.0.0";
-var FALLBACK_DESCRIPTION = pkg.description ?? "Command-line interface for Omnara.";
-var PACKAGE_NAME = true ? "omnara" : FALLBACK_NAME;
-var PACKAGE_VERSION = true ? "0.5.2" : FALLBACK_VERSION;
-var PACKAGE_DESCRIPTION = true ? "Command-line interface for Omnara." : FALLBACK_DESCRIPTION;
+var isBundled = true;
+var PACKAGE_VERSION = isBundled ? "0.6.0" : "0.0.0-dev";
+var PACKAGE_DESCRIPTION = isBundled ? "Command-line interface for Omnara." : "Command-line interface for Omnara.";
 
 // src/daemon/machine-supervisor.ts
 var HEARTBEAT_INTERVAL_MS = 1e4;
@@ -17878,13 +18204,13 @@ var MachineSupervisor = class {
           } else {
             this.logger.debug("Machine supervisor still waiting for login\u2026");
           }
-          await delay4(LOGIN_WAIT_DELAY_MS2);
+          await delay5(LOGIN_WAIT_DELAY_MS2);
         } else {
           Sentry21.captureException(error);
           this.logger.warn(
             `Machine supervisor error: ${error.message}. Retrying in ${Math.round(retryDelayMs / 1e3)}s.`
           );
-          await delay4(retryDelayMs);
+          await delay5(retryDelayMs);
           retryDelayMs = calculateBackoff(retryDelayMs);
         }
       }
@@ -17957,7 +18283,7 @@ var MachineSupervisor = class {
     const url = buildMachineWebsocketUrl(this.backendUrl, identity.wsPath);
     this.logger.info(`Connecting to machine websocket at ${url}`);
     await new Promise((resolve, reject) => {
-      const ws = new WebSocket2(url, {
+      const ws = new WebSocket3(url, {
         headers: {
           authorization: `Bearer ${identity.token}`
         }
@@ -17974,17 +18300,7 @@ var MachineSupervisor = class {
         }
         this.clearHeartbeatTimer();
         this.websocket = null;
-        try {
-          if (ws.readyState === WebSocket2.CONNECTING) {
-            ws.terminate();
-          } else if (ws.readyState === WebSocket2.OPEN) {
-            ws.removeAllListeners();
-            ws.close();
-          } else {
-            ws.removeAllListeners();
-          }
-        } catch {
-        }
+        safeCloseWebSocket(ws);
         if (error) {
           reject(error);
         } else {
@@ -18051,12 +18367,18 @@ var MachineSupervisor = class {
     }
   }
   async handleRpcRequest(message) {
-    if (message.method !== "start_session") {
+    if (message.method === "start_session") {
+      await this.handleStartSession(message);
+    } else if (message.method === "stop_session") {
+      await this.handleStopSession(message);
+    } else {
       await this.sendRpcResponse(message.request_id, "error", `Unknown method ${message.method}`);
-      return;
     }
+  }
+  async handleStartSession(message) {
     try {
-      const result = await this.launchWorkspaceSessionFromRpc(message.payload);
+      const payload = message.payload;
+      const result = await this.launchWorkspaceSessionFromRpc(payload);
       await this.sendRpcResponse(message.request_id, "ok", void 0, {
         launch_id: result.launchId,
         user_session_id: result.userSessionId,
@@ -18075,6 +18397,25 @@ var MachineSupervisor = class {
       await this.sendRpcResponse(message.request_id, "error", messageText);
     }
   }
+  async handleStopSession(message) {
+    const payload = message.payload;
+    const userSessionId = payload.user_session_id;
+    try {
+      const stopped = await this.sessionManager.stopSession(userSessionId);
+      if (stopped) {
+        this.logger.info(`Stopped session ${userSessionId}`);
+        await this.sendRpcResponse(message.request_id, "ok");
+      } else {
+        this.logger.debug(`Session ${userSessionId} was not running`);
+        await this.sendRpcResponse(message.request_id, "not_found", "Session not running");
+      }
+    } catch (error) {
+      Sentry21.captureException(error);
+      const messageText = error instanceof Error ? error.message : String(error);
+      this.logger.warn(`Failed to stop session ${userSessionId}: ${messageText}`);
+      await this.sendRpcResponse(message.request_id, "error", messageText);
+    }
+  }
   async sendRpcResponse(requestId, status, error, body) {
     const response = {
       type: "rpc_response",
@@ -18196,7 +18537,7 @@ var MachineSupervisor = class {
           return;
         }
       }
-      await delay4(250);
+      await delay5(250);
     }
     throw new Error("Machine has not finished registering yet. Try again in a few seconds.");
   }
@@ -18232,7 +18573,7 @@ var MachineSupervisor = class {
   }
   async sendMessage(payload) {
     const ws = this.websocket;
-    if (!ws || ws.readyState !== WebSocket2.OPEN) {
+    if (!ws || ws.readyState !== WebSocket3.OPEN) {
       throw new Error("Machine websocket is not connected");
     }
     await new Promise((resolve, reject) => {
@@ -18415,12 +18756,316 @@ var DaemonService = class {
 // src/daemon/run-daemon.ts
 import fs12 from "node:fs";
 import path14 from "node:path";
-async function runDaemonProcess() {
-  await ensureOmnaraHome();
-  await ensureDirectory(DAEMON_LOG_DIR);
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const fileName = `${timestamp}-${process.pid}.log`;
-  const logPath = path14.join(DAEMON_LOG_DIR, fileName);
+
+// src/utils/version-check.ts
+import chalk4 from "chalk";
+import { execSync as execSync2 } from "node:child_process";
+import { realpathSync } from "node:fs";
+import { platform, arch } from "node:os";
+import * as Sentry23 from "@sentry/node";
+var RELEASE_BASE_URL = process.env.OMNARA_RELEASE_URL ?? "https://releases.omnara.com";
+var FRONTEND_BASE_URL = process.env.OMNARA_FRONTEND_URL ?? "https://omnara.com";
+var IS_PRERELEASE = process.env.PRERELEASE === "1";
+var INSTALL_SCRIPT_URL_UNIX = `${FRONTEND_BASE_URL}/install/install.sh`;
+var INSTALL_SCRIPT_URL_WINDOWS = `${FRONTEND_BASE_URL}/install/install.ps1`;
+function detectPlatform() {
+  const os6 = platform();
+  const cpuArch = arch();
+  let platformId;
+  if (os6 === "darwin" && cpuArch === "arm64") {
+    platformId = "darwin-arm64";
+  } else if (os6 === "darwin" && cpuArch === "x64") {
+    platformId = "darwin-x64";
+  } else if (os6 === "linux" && cpuArch === "x64") {
+    platformId = isMusl() ? "linux-x64-musl" : "linux-x64";
+  } else if (os6 === "linux" && cpuArch === "arm64") {
+    platformId = "linux-arm64";
+  } else if (os6 === "win32" && cpuArch === "x64") {
+    platformId = "windows-x64";
+  } else {
+    throw new Error(`Unsupported platform: ${os6}-${cpuArch}`);
+  }
+  return platformId;
+}
+function isMusl() {
+  try {
+    const result = execSync2("ldd --version 2>&1 || true", { encoding: "utf8" });
+    return result.toLowerCase().includes("musl");
+  } catch {
+    return false;
+  }
+}
+async function fetchLatestRelease() {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 5e3);
+  timeout.unref?.();
+  try {
+    const basePath = IS_PRERELEASE ? `${RELEASE_BASE_URL}/prerelease` : RELEASE_BASE_URL;
+    const url = `${basePath}/latest/release.json`;
+    const response = await fetch(url, { signal: controller.signal });
+    if (!response.ok) {
+      return null;
+    }
+    return await response.json();
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+function compareVersions(v1, v2) {
+  const clean1 = v1.replace(/^v/, "");
+  const clean2 = v2.replace(/^v/, "");
+  const parts1 = clean1.split(".").map(Number);
+  const parts2 = clean2.split(".").map(Number);
+  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+    const part1 = parts1[i] || 0;
+    const part2 = parts2[i] || 0;
+    if (part1 > part2) return 1;
+    if (part1 < part2) return -1;
+  }
+  return 0;
+}
+function isNpmInstallation() {
+  if (isBunSingleFileExecutable()) {
+    return false;
+  }
+  const execPath = process.argv[1] ?? "";
+  if (execPath.includes("node_modules")) {
+    return true;
+  }
+  if (execPath.includes("/lib/node_modules/") || execPath.includes("\\node_modules\\")) {
+    return true;
+  }
+  try {
+    const realPath = realpathSync(execPath);
+    if (realPath.includes("node_modules")) {
+      return true;
+    }
+  } catch {
+  }
+  return false;
+}
+function uninstallNpmVersion() {
+  console.log(chalk4.blue("Uninstalling npm version of Omnara..."));
+  try {
+    execSync2("npm uninstall -g omnara", { stdio: "inherit" });
+    return true;
+  } catch {
+    try {
+      if (platform() !== "win32") {
+        execSync2("sudo npm uninstall -g omnara", { stdio: "inherit" });
+        return true;
+      }
+    } catch {
+    }
+  }
+  console.log(chalk4.yellow("Could not automatically uninstall npm version."));
+  console.log(chalk4.yellow("Please run manually: npm uninstall -g omnara"));
+  return false;
+}
+async function runInstallScript(options) {
+  const os6 = platform();
+  const silent = options?.silent ?? false;
+  const stdio = silent ? "pipe" : "inherit";
+  if (!silent) {
+    if (IS_PRERELEASE) {
+      console.log(chalk4.blue("\nRunning Omnara installation script (prerelease channel)...\n"));
+    } else {
+      console.log(chalk4.blue("\nRunning Omnara installation script...\n"));
+    }
+  }
+  const env = { ...process.env };
+  if (IS_PRERELEASE) {
+    env.PRERELEASE = "1";
+  }
+  try {
+    if (os6 === "win32") {
+      const prereleaseEnv = IS_PRERELEASE ? '$env:PRERELEASE="1"; ' : "";
+      const cmd = `powershell -ExecutionPolicy Bypass -Command "& { ${prereleaseEnv}iwr -useb '${INSTALL_SCRIPT_URL_WINDOWS}' | iex }"`;
+      execSync2(cmd, { stdio, env });
+    } else {
+      const cmd = `curl -fsSL '${INSTALL_SCRIPT_URL_UNIX}' | bash`;
+      execSync2(cmd, { stdio, shell: "/bin/bash", env });
+    }
+    return true;
+  } catch (error) {
+    Sentry23.captureException(error);
+    if (!silent) {
+      console.log(chalk4.red("\nInstallation script failed."));
+      console.log(chalk4.yellow("Please install manually:"));
+      const prereleasePrefix = IS_PRERELEASE ? "PRERELEASE=1 " : "";
+      if (os6 === "win32") {
+        const psPrefix = IS_PRERELEASE ? '$env:PRERELEASE="1"; ' : "";
+        console.log(chalk4.cyan(`  ${psPrefix}irm ${INSTALL_SCRIPT_URL_WINDOWS} | iex`));
+      } else {
+        console.log(
+          chalk4.cyan(`  ${prereleasePrefix}curl -fsSL ${INSTALL_SCRIPT_URL_UNIX} | bash`)
+        );
+      }
+    }
+    return false;
+  }
+}
+async function handleNpmInstallation() {
+  const os6 = platform();
+  const installCmd = os6 === "win32" ? `irm ${INSTALL_SCRIPT_URL_WINDOWS} | iex` : `curl -fsSL ${INSTALL_SCRIPT_URL_UNIX} | bash`;
+  const border = chalk4.yellow("=".repeat(60));
+  console.log("\n" + border);
+  console.log(chalk4.yellow.bold("  npm Installation Detected"));
+  console.log(border);
+  console.log(
+    chalk4.white(`
+  Omnara CLI is now distributed as a standalone executable
+  with automatic updates and improved performance.
+
+  Migrating to the new installation method...
+`)
+  );
+  uninstallNpmVersion();
+  const success = await runInstallScript();
+  if (success) {
+    console.log(chalk4.green("\nMigration complete!"));
+    console.log(chalk4.white("Please restart your terminal and run `omnara` again.\n"));
+    return true;
+  } else {
+    console.log(
+      chalk4.yellow(`
+To complete migration manually, run:
+
+  ${chalk4.cyan(installCmd)}
+`)
+    );
+    return false;
+  }
+}
+async function checkForUpdate() {
+  const currentVersion = PACKAGE_VERSION;
+  if (!currentVersion) {
+    return { available: false, currentVersion: "0.0.0", isPrerelease: IS_PRERELEASE };
+  }
+  try {
+    const release = await fetchLatestRelease();
+    if (!release) {
+      return { available: false, currentVersion, isPrerelease: IS_PRERELEASE };
+    }
+    const platformId = detectPlatform();
+    const hasPlatformBinary = !!release.platforms[platformId];
+    if (!hasPlatformBinary) {
+      return { available: false, currentVersion, isPrerelease: IS_PRERELEASE };
+    }
+    const updateAvailable = compareVersions(release.version, currentVersion) > 0;
+    return {
+      available: updateAvailable,
+      latestVersion: release.version,
+      currentVersion,
+      isPrerelease: IS_PRERELEASE
+    };
+  } catch {
+    return { available: false, currentVersion, isPrerelease: IS_PRERELEASE };
+  }
+}
+async function performUpdate(options) {
+  const silent = options?.silent ?? false;
+  try {
+    if (!silent) {
+      const client = new DaemonClient();
+      const status = await client.getStatus().catch(() => null);
+      if (status) {
+        console.log(chalk4.yellow("Stopping daemon for update..."));
+        await client.stop("UPDATING").catch(() => {
+        });
+      }
+    }
+    const success = await runInstallScript({ silent });
+    if (success && !silent) {
+      console.log(chalk4.green("\nUpdate complete!"));
+      console.log(chalk4.white("The daemon will restart automatically.\n"));
+    }
+    return success;
+  } catch (error) {
+    Sentry23.captureException(error);
+    return false;
+  }
+}
+async function attemptUpdate() {
+  try {
+    const currentVersion = PACKAGE_VERSION;
+    if (!currentVersion) {
+      return false;
+    }
+    if (isNpmInstallation()) {
+      return await handleNpmInstallation();
+    }
+    const updateInfo = await checkForUpdate();
+    if (!updateInfo.available) {
+      const channel = IS_PRERELEASE ? " (prerelease channel)" : "";
+      console.log(chalk4.grey(`Omnara is up to date${channel}!
+`));
+      return false;
+    }
+    const channelLabel = IS_PRERELEASE ? " (prerelease)" : "";
+    console.log(
+      chalk4.yellow(
+        "\u2550".repeat(60) + `
+Update available for Omnara CLI${channelLabel}
+Current version: ${updateInfo.currentVersion}
+Latest version: ${updateInfo.latestVersion}
+${"\u2550".repeat(60)}`
+      )
+    );
+    const success = await performUpdate();
+    if (success) {
+      console.log(chalk4.white("Please restart `omnara` to use the new version.\n"));
+      return true;
+    }
+    return false;
+  } catch (e) {
+    Sentry23.captureException(e);
+  }
+  return false;
+}
+
+// src/daemon/run-daemon.ts
+var UPDATE_CHECK_INTERVAL_MS = 5 * 60 * 1e3;
+function startUpdateChecker(logger3, onUpdateInstalled) {
+  const checkForUpdates = async () => {
+    try {
+      logger3.debug("Checking for updates...");
+      const updateInfo = await checkForUpdate();
+      if (updateInfo.available) {
+        logger3.info(
+          `Update available: ${updateInfo.currentVersion} -> ${updateInfo.latestVersion}`
+        );
+        logger3.info("Starting background update...");
+        const success = await runInstallScript({ silent: true });
+        if (success) {
+          logger3.info("Update installed. Triggering graceful shutdown for restart...");
+          onUpdateInstalled();
+        } else {
+          logger3.warn("Background update failed. Will retry on next check.");
+        }
+      } else {
+        logger3.debug(`No updates available (current: ${updateInfo.currentVersion})`);
+      }
+    } catch (error) {
+      Sentry24.captureException(error);
+      logger3.error("Update check failed:", error);
+    }
+  };
+  setTimeout(() => {
+    void checkForUpdates();
+  }, 1e4);
+  return setInterval(() => {
+    void checkForUpdates();
+  }, UPDATE_CHECK_INTERVAL_MS);
+}
+async function runDaemonProcess() {
+  await ensureOmnaraHome();
+  await ensureDirectory(DAEMON_LOG_DIR);
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const fileName = `${timestamp}-${process.pid}.log`;
+  const logPath = path14.join(DAEMON_LOG_DIR, fileName);
   const stream = fs12.createWriteStream(logPath, {
     flags: "a",
     mode: DEFAULT_FILE_MODE2
@@ -18466,11 +19111,18 @@ async function runDaemonProcess() {
     machineSupervisor,
     logger: logger3
   });
+  const updateCheckInterval = startUpdateChecker(logger3, () => {
+    logger3.info("Update installed, initiating graceful shutdown...");
+    void service.stop().catch((error) => {
+      Sentry24.captureException(error);
+      logger3.error("Failed to stop daemon after update:", error);
+    });
+  });
   const makeSignalHandler = (signal) => {
     return () => {
       logger3.warn(`Received ${signal}. Stopping daemon...`);
       void service.stop().catch((error) => {
-        Sentry23.captureException(error);
+        Sentry24.captureException(error);
         logger3.error("Failed to stop daemon:", error);
       });
     };
@@ -18483,10 +19135,11 @@ async function runDaemonProcess() {
     await service.start();
     await service.waitForShutdown();
   } catch (error) {
-    Sentry23.captureException(error);
+    Sentry24.captureException(error);
     logger3.error("Daemon exited with error:", error);
     process.exitCode = 1;
   } finally {
+    clearInterval(updateCheckInterval);
     process.off("SIGINT", sigint);
     process.off("SIGTERM", sigterm);
     await service.stop().catch(() => void 0);
@@ -18543,7 +19196,7 @@ function buildDaemonCommand() {
     try {
       process.chdir(options.directory);
     } catch (error) {
-      Sentry24.captureException(error);
+      Sentry25.captureException(error);
       logger.error(
         `Unable to switch to directory ${options.directory}: ${error.message}`
       );
@@ -18562,7 +19215,7 @@ function buildDaemonCommand() {
         worktreeName: options.worktreeName
       });
     } catch (error) {
-      Sentry24.captureException(error);
+      Sentry25.captureException(error);
       logger.error("User session exited with error:", error);
       process.exitCode = process.exitCode || 1;
     }
@@ -18594,190 +19247,6 @@ function buildKillCommand() {
   return kill;
 }
 
-// src/utils/version-check.ts
-import chalk3 from "chalk";
-import { execSync } from "child_process";
-import * as Sentry25 from "@sentry/node";
-async function fetchLatestVersion(packageName) {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), 3e3);
-  timeout.unref?.();
-  try {
-    const url = `https://registry.npmjs.org/${encodeURIComponent(packageName)}`;
-    const response = await fetch(url, { signal: controller.signal });
-    if (!response.ok) {
-      return null;
-    }
-    const packageInfo = await response.json();
-    return packageInfo["dist-tags"]?.latest ?? null;
-  } catch {
-    return null;
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-function compareVersions(v1, v2) {
-  const parts1 = v1.split(".").map(Number);
-  const parts2 = v2.split(".").map(Number);
-  for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
-    const part1 = parts1[i] || 0;
-    const part2 = parts2[i] || 0;
-    if (part1 > part2) return 1;
-    if (part1 < part2) return -1;
-  }
-  return 0;
-}
-async function attemptUpdate() {
-  try {
-    const currentVersion = PACKAGE_VERSION;
-    const packageName = PACKAGE_NAME;
-    if (!currentVersion || !packageName) {
-      return false;
-    }
-    const latestVersion = await fetchLatestVersion(packageName);
-    if (!latestVersion) {
-      return false;
-    }
-    if (compareVersions(latestVersion, currentVersion) > 0) {
-      const client = new DaemonClient();
-      console.log(
-        chalk3.yellow(
-          "\u2550".repeat(60),
-          `
-Update available for Omnara CLI`,
-          `
-Current version: ${currentVersion}`,
-          `
-Latest version: ${latestVersion}`,
-          `
-${"\u2550".repeat(60)}`
-        )
-      );
-      const status = await client.getStatus();
-      if (status) {
-        console.log(chalk3.yellow("\nPausing daemon..."));
-        client.stop("UPDATING");
-      }
-      console.log(
-        chalk3.blue(
-          "\nAuto-updating Omnara CLI:",
-          `
-
-$ npm install -g ${packageName}@latest`,
-          `
-
-Installing...
-
-`
-        )
-      );
-      try {
-        execSync("npm install -g omnara@latest");
-        console.log(chalk3.green("\n\nUpdate complete! Rerun `omnara` to restart session.\n"));
-        return true;
-      } catch (err) {
-        console.log(
-          chalk3.red(
-            "\nAuto-update failed. Please install manually:",
-            `
-
-$ npm install -g ${packageName}@latest`,
-            `
-
-If you see EACCES/permission errors, retry with:`,
-            `
-
-$ sudo npm install -g ${packageName}@latest`,
-            "\n"
-          )
-        );
-        Sentry25.captureException(err);
-      }
-    } else {
-      console.log(chalk3.grey("Omnara is up to date!\n"));
-    }
-  } catch (e) {
-    Sentry25.captureException(e);
-    console.log(e);
-  }
-  return false;
-}
-
-// src/utils/claude-code-check.ts
-import chalk4 from "chalk";
-import { query as query4 } from "@anthropic-ai/claude-agent-sdk";
-async function performClaudeCodeCheck() {
-  if (process.env.OMNARA_SKIP_CLAUDE_CHECK === "true") {
-    return true;
-  }
-  const indicator = createClaudeCheckIndicator();
-  try {
-    indicator?.start();
-    for await (const message of query4({
-      prompt: "Respond with one word.",
-      options: { maxTurns: 1, model: "haiku", settingSources: ["user", "project", "local"] }
-    })) {
-      void message;
-    }
-    indicator?.stop("ok");
-    return true;
-  } catch {
-    indicator?.stop("fail");
-    console.log(
-      chalk4.red(
-        "\nError: Omnara couldn't run because it relies on Claude Code, which isn't installed or authenticated. Try running `claude /login`.\n"
-      )
-    );
-    return false;
-  }
-}
-function createClaudeCheckIndicator() {
-  if (!process.stdout.isTTY) {
-    return {
-      start() {
-        console.log("Checking Claude Code auth...");
-      },
-      stop(status) {
-        if (status !== "ok") {
-          console.log("Claude Code auth failed.");
-        }
-      }
-    };
-  }
-  const label = "Checking Claude Code auth";
-  const frames = ["-", "\\", "|", "/"];
-  let index = 0;
-  let interval = null;
-  let running = false;
-  const stopLine = (status) => {
-    if (!running) {
-      return;
-    }
-    running = false;
-    if (interval) {
-      clearInterval(interval);
-    }
-    const statusText = status === "ok" ? chalk4.green("OK") : chalk4.red("FAILED");
-    const padding = "   ";
-    process.stdout.write(`\r${label} ${statusText}${padding}
-`);
-  };
-  return {
-    start() {
-      if (running) {
-        return;
-      }
-      running = true;
-      process.stdout.write(`${label} ...`);
-      interval = setInterval(() => {
-        process.stdout.write(`\r${label} ${frames[index]}  `);
-        index = (index + 1) % frames.length;
-      }, 120);
-    },
-    stop: stopLine
-  };
-}
-
 // src/cli.ts
 import chalk5 from "chalk";
 function createProgram() {
@@ -18814,6 +19283,9 @@ async function run(argv) {
   }
 }
 function isMainModule() {
+  if (isBunSingleFileExecutable()) {
+    return true;
+  }
   if (!import.meta.url || !process.argv[1]) {
     return false;
   }