@dmmulroy/overseer 0.7.0 → 0.8.2

package/bin/os

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 /**
  * Unified CLI entry point
- * - `os mcp` → starts MCP server (Node, codemode)
- * - `os <cmd>` → forwards to native binary
+ * 
+ * Delegates all commands to the native binary.
+ * The native binary handles spawning Node for `ui` and `mcp` commands.
  */
 import { existsSync, readFileSync } from "node:fs";
 import { execSync, spawn } from "node:child_process";
@@ -71,137 +72,22 @@ function getBinaryPath() {
 }
 
 const args = process.argv.slice(2);
-const command = args[0];
 
-// Handle `os mcp` - start MCP server
-if (command === "mcp") {
-  const binaryPath = getBinaryPath();
-  process.env.OVERSEER_CLI_PATH = binaryPath;
-
-  const serverPath = join(__dirname, "..", "dist", "index.js");
-  import(serverPath).catch((err) => {
-    console.error("Failed to start MCP server:", err.message);
-    process.exit(1);
-  });
-}
-// Handle `os ui` - start Task Viewer webapp
-else if (command === "ui") {
-  startUiServer(args.slice(1));
-}
-// All other commands - passthrough to native binary
-else {
-  const child = spawn(getBinaryPath(), args, {
-    stdio: "inherit",
-  });
-
-  child.on("error", (err) => {
-    console.error(`Failed to run os: ${err.message}`);
-    process.exit(1);
-  });
-
-  child.on("exit", (code, signal) => {
-    if (signal) {
-      process.kill(process.pid, signal);
-    } else {
-      process.exit(code ?? 0);
-    }
-  });
-}
-
-/**
- * Start the UI server
- * Usage: os ui [port] [--port PORT] [--no-open]
- */
-function startUiServer(uiArgs) {
-  // Parse args: positional port, --port flag, --no-open flag
-  let port = null;
-  let openBrowser = true;  // Default: open browser
-
-  for (let i = 0; i < uiArgs.length; i++) {
-    const arg = uiArgs[i];
-    if (arg === "--port" && i + 1 < uiArgs.length) {
-      port = parseInt(uiArgs[++i], 10);
-    } else if (arg === "--no-open") {
-      openBrowser = false;
-    } else if (arg === "--help" || arg === "-h") {
-      console.log(`Usage: os ui [port] [--port PORT] [--no-open]
-
-Options:
-  port          Port number (positional, default: 6969)
-  --port PORT   Port number (explicit flag)
-  --no-open     Don't open browser automatically
-
-Examples:
-  os ui              # Start and open browser
-  os ui 8080         # Port 8080, open browser
-  os ui --port 3000  # Port 3000, open browser
-  os ui --no-open    # Start without opening browser`);
-      process.exit(0);
-    } else if (/^\d+$/.test(arg) && port === null) {
-      // Positional port number
-      port = parseInt(arg, 10);
-    }
+// All commands delegate to the native binary
+// The binary handles `ui` and `mcp` by spawning Node with the host package
+const child = spawn(getBinaryPath(), args, {
+  stdio: "inherit",
+});
+
+child.on("error", (err) => {
+  console.error(`Failed to run os: ${err.message}`);
+  process.exit(1);
+});
+
+child.on("exit", (code, signal) => {
+  if (signal) {
+    process.kill(process.pid, signal);
+  } else {
+    process.exit(code ?? 0);
   }
-
-  // Port precedence: --port > positional > PORT env > 6969
-  if (port === null && process.env.PORT) {
-    port = parseInt(process.env.PORT, 10);
-  }
-  if (port === null || isNaN(port)) {
-    port = 6969;
-  }
-
-  // Graceful shutdown handler
-  const shutdown = () => {
-    process.stdout.write('\x1b[0m');  // Reset terminal attributes
-    console.log('\nServer stopped');
-    process.exit(0);
-  };
-  process.on('SIGINT', shutdown);
-  process.on('SIGTERM', shutdown);
-
-  // Set up environment for the UI server
-  const binaryPath = getBinaryPath();
-  process.env.OVERSEER_CLI_PATH = binaryPath;
-  process.env.PORT = String(port);
-  process.env.NODE_ENV = "production";
-  
-  // Preserve original cwd for CLI calls (must happen before chdir)
-  process.env.OVERSEER_CLI_CWD = process.cwd();
-  
-  // Static files are in dist/ui/static/ relative to package root
-  const uiDir = join(__dirname, "..", "dist", "ui");
-  process.env.OVERSEER_UI_STATIC_ROOT = join(uiDir, "static");
-
-  // Change cwd to ui dir (serveStatic needs relative path from cwd)
-  process.chdir(uiDir);
-
-  const serverPath = join(uiDir, "server.js");
-  
-  if (!existsSync(serverPath)) {
-    console.error("UI server not found. The package may not have been built correctly.");
-    console.error(`Expected: ${serverPath}`);
-    process.exit(1);
-  }
-
-  // Open browser after server starts (default behavior)
-  if (openBrowser) {
-    // Delay to let server start
-    setTimeout(() => {
-      const url = `http://localhost:${port}`;
-      const openCmd =
-        platform === "darwin" ? "open" :
-        platform === "win32" ? "start" : "xdg-open";
-      try {
-        execSync(`${openCmd} ${url}`, { stdio: "ignore" });
-      } catch {
-        // Ignore errors (e.g., no display)
-      }
-    }, 500);
-  }
-
-  import(serverPath).catch((err) => {
-    console.error("Failed to start UI server:", err.message);
-    process.exit(1);
-  });
-}
+});

package/{dist → host/dist}/api/index.d.ts

@@ -1,6 +1,5 @@
 /**
- * API exports
+ * API exports for VM sandbox
  */
 export { tasks } from "./tasks.js";
 export { learnings } from "./learnings.js";
-//# sourceMappingURL=index.d.ts.map

package/{dist → host/dist}/api/index.js

@@ -1,6 +1,5 @@
 /**
- * API exports
+ * API exports for VM sandbox
  */
 export { tasks } from "./tasks.js";
 export { learnings } from "./learnings.js";
-//# sourceMappingURL=index.js.map

package/{dist → host/dist}/api/learnings.d.ts

@@ -9,4 +9,3 @@ export declare const learnings: {
      */
     list(taskId: string): Promise<Learning[]>;
 };
-//# sourceMappingURL=learnings.d.ts.map

package/{dist → host/dist}/api/learnings.js

@@ -6,6 +6,7 @@
  * This API only provides read access for viewing learnings.
  */
 import { callCli } from "../cli.js";
+import { decodeLearnings } from "../decoder.js";
 /**
  * Learnings API exposed to VM sandbox
  */
@@ -15,7 +16,6 @@ export const learnings = {
      * Includes learnings bubbled from completed child tasks.
      */
     async list(taskId) {
-        return (await callCli(["learning", "list", taskId]));
+        return decodeLearnings(await callCli(["learning", "list", taskId])).unwrap("learnings.list");
     },
 };
-//# sourceMappingURL=learnings.js.map

package/{dist → host/dist}/api/tasks.d.ts

@@ -118,4 +118,3 @@ export declare const tasks: {
      */
     progress(rootId?: string): Promise<TaskProgress>;
 };
-//# sourceMappingURL=tasks.d.ts.map

package/{dist → host/dist}/api/tasks.js

@@ -181,4 +181,3 @@ export const tasks = {
         return decodeTaskProgress(await callCli(args)).unwrap("tasks.progress");
     },
 };
-//# sourceMappingURL=tasks.js.map

package/host/dist/cli.d.ts

@@ -0,0 +1,18 @@
+export interface CliConfig {
+    /** Path to the os binary */
+    cliPath: string;
+    /** Working directory for CLI commands */
+    cwd: string;
+}
+/**
+ * Configure the CLI bridge
+ */
+export declare function configureCli(newConfig: CliConfig): void;
+/**
+ * Get current CLI config
+ */
+export declare function getCliConfig(): CliConfig;
+/**
+ * Execute os CLI command with --json flag
+ */
+export declare function callCli(args: string[]): Promise<unknown>;

package/{dist → host/dist}/cli.js

@@ -1,19 +1,36 @@
 /**
  * CLI bridge - spawns `os` binary and parses JSON output
+ *
+ * Configuration is passed via constructor, not environment variables.
+ * This allows the Rust CLI to set paths correctly when spawning.
  */
 import { spawn } from "node:child_process";
 import { CliError, CliTimeoutError } from "./types.js";
 const CLI_TIMEOUT_MS = 30_000;
-// Allow override via env var (useful for tests)
-const CLI_PATH = process.env.OVERSEER_CLI_PATH || "os";
-const CLI_CWD = process.env.OVERSEER_CLI_CWD || process.cwd();
+// Global config, set by main entry point
+let config = {
+    cliPath: "os",
+    cwd: process.cwd(),
+};
+/**
+ * Configure the CLI bridge
+ */
+export function configureCli(newConfig) {
+    config = newConfig;
+}
+/**
+ * Get current CLI config
+ */
+export function getCliConfig() {
+    return config;
+}
 /**
  * Execute os CLI command with --json flag
  */
 export async function callCli(args) {
     return new Promise((resolve, reject) => {
-        const proc = spawn(CLI_PATH, [...args, "--json"], {
-            cwd: CLI_CWD,
+        const proc = spawn(config.cliPath, [...args, "--json"], {
+            cwd: config.cwd,
             stdio: ["ignore", "pipe", "pipe"],
         });
         const timeout = setTimeout(() => {
@@ -49,4 +66,3 @@ export async function callCli(args) {
         });
     });
 }
-//# sourceMappingURL=cli.js.map

package/{dist → host/dist}/decoder.d.ts

@@ -50,4 +50,3 @@ export declare function decodeTaskTrees(v: unknown): Result<TaskTree[], DecodeEr
  */
 export declare function decodeTaskProgress(v: unknown): Result<TaskProgress, DecodeError>;
 export {};
-//# sourceMappingURL=decoder.d.ts.map

package/{dist → host/dist}/decoder.js

@@ -370,4 +370,3 @@ export function decodeTaskProgress(v) {
     }
     return Result.ok({ total, completed, ready, blocked });
 }
-//# sourceMappingURL=decoder.js.map

package/{dist → host/dist}/executor.d.ts

@@ -9,4 +9,3 @@ export declare class ExecutionError extends Error {
     readonly stackTrace?: string | undefined;
     constructor(message: string, stackTrace?: string | undefined);
 }
-//# sourceMappingURL=executor.d.ts.map

package/{dist → host/dist}/executor.js

@@ -113,4 +113,3 @@ export class ExecutionError extends Error {
         this.name = "ExecutionError";
     }
 }
-//# sourceMappingURL=executor.js.map

package/host/dist/index.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/host/dist/index.js

@@ -0,0 +1,136 @@
+#!/usr/bin/env node
+/**
+ * Overseer Host - Unified entry point for MCP and UI servers
+ *
+ * Usage:
+ *   overseer-host mcp --cli-path /path/to/os --cwd /path/to/repo
+ *   overseer-host ui --cli-path /path/to/os --cwd /path/to/repo --static-root /path/to/dist --port 6969
+ */
+import { configureCli } from "./cli.js";
+import { startMcpServer } from "./mcp.js";
+import { startUiServer } from "./ui.js";
+function parseArgs(argv) {
+    const args = argv.slice(2); // Skip node and script
+    if (args.length === 0) {
+        printUsage();
+        process.exit(1);
+    }
+    const mode = args[0];
+    if (mode !== "mcp" && mode !== "ui") {
+        console.error(`Unknown mode: ${mode}`);
+        printUsage();
+        process.exit(1);
+    }
+    const result = {
+        mode,
+        cliPath: "os",
+        cwd: process.cwd(),
+    };
+    for (let i = 1; i < args.length; i++) {
+        const arg = args[i];
+        const next = args[i + 1];
+        switch (arg) {
+            case "--cli-path":
+                if (!next) {
+                    console.error("--cli-path requires a value");
+                    process.exit(1);
+                }
+                result.cliPath = next;
+                i++;
+                break;
+            case "--cwd":
+                if (!next) {
+                    console.error("--cwd requires a value");
+                    process.exit(1);
+                }
+                result.cwd = next;
+                i++;
+                break;
+            case "--static-root":
+                if (!next) {
+                    console.error("--static-root requires a value");
+                    process.exit(1);
+                }
+                result.staticRoot = next;
+                i++;
+                break;
+            case "--port":
+                if (!next) {
+                    console.error("--port requires a value");
+                    process.exit(1);
+                }
+                result.port = parseInt(next, 10);
+                if (isNaN(result.port)) {
+                    console.error(`Invalid port: ${next}`);
+                    process.exit(1);
+                }
+                i++;
+                break;
+            case "--help":
+            case "-h":
+                printUsage();
+                process.exit(0);
+                break;
+            default:
+                console.error(`Unknown argument: ${arg}`);
+                printUsage();
+                process.exit(1);
+        }
+    }
+    // Validate UI-specific args
+    if (mode === "ui") {
+        if (!result.staticRoot) {
+            console.error("UI mode requires --static-root");
+            process.exit(1);
+        }
+        if (!result.port) {
+            result.port = 6969;
+        }
+    }
+    return result;
+}
+function printUsage() {
+    console.log(`
+Overseer Host - Unified MCP and UI server
+
+Usage:
+  overseer-host <mode> [options]
+
+Modes:
+  mcp    Start MCP server (stdio)
+  ui     Start UI server (HTTP)
+
+Options:
+  --cli-path <path>      Path to os binary (default: "os" in PATH)
+  --cwd <path>           Working directory for CLI commands (default: current dir)
+
+UI-specific options:
+  --static-root <path>   Path to static files (required for UI mode)
+  --port <number>        HTTP port (default: 6969)
+
+Examples:
+  overseer-host mcp --cli-path /usr/local/bin/os --cwd /home/user/project
+  overseer-host ui --cli-path ./os --cwd . --static-root ./dist --port 8080
+`.trim());
+}
+async function main() {
+    const args = parseArgs(process.argv);
+    // Configure CLI bridge
+    configureCli({
+        cliPath: args.cliPath,
+        cwd: args.cwd,
+    });
+    if (args.mode === "mcp") {
+        await startMcpServer();
+    }
+    else {
+        await startUiServer({
+            port: args.port ?? 6969,
+            staticRoot: args.staticRoot ?? "./dist",
+        });
+    }
+}
+main().catch((err) => {
+    console.error("Fatal error:", err);
+    process.exit(1);
+});

package/{dist/server.d.ts → host/dist/mcp.d.ts}

@@ -5,9 +5,8 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 /**
  * Create and configure MCP server
  */
-export declare function createServer(): Server;
+export declare function createMcpServer(): Server;
 /**
  * Start MCP server with stdio transport
  */
-export declare function startServer(): Promise<void>;
-//# sourceMappingURL=server.d.ts.map
+export declare function startMcpServer(): Promise<void>;

package/{dist/server.js → host/dist/mcp.js}

@@ -144,10 +144,10 @@ await tasks.complete(task.id, { result: "Implemented using jose library" });
 /**
  * Create and configure MCP server
  */
-export function createServer() {
+export function createMcpServer() {
     const server = new Server({
         name: "overseer-mcp",
-        version: "0.1.0",
+        version: "0.7.0",
     }, {
         capabilities: {
             tools: {},
@@ -229,10 +229,9 @@ export function createServer() {
 /**
  * Start MCP server with stdio transport
  */
-export async function startServer() {
-    const server = createServer();
+export async function startMcpServer() {
+    const server = createMcpServer();
     const transport = new StdioServerTransport();
     await server.connect(transport);
     console.error("Overseer MCP server running on stdio");
 }
-//# sourceMappingURL=server.js.map

package/{dist → host/dist}/types.d.ts

@@ -106,4 +106,3 @@ export declare class CliTimeoutError extends Error {
     constructor(message?: string);
 }
 export {};
-//# sourceMappingURL=types.d.ts.map

package/{dist → host/dist}/types.js

@@ -39,4 +39,3 @@ export class CliTimeoutError extends Error {
         this.name = "CliTimeoutError";
     }
 }
-//# sourceMappingURL=types.js.map