@castlemilk/omega 0.5.0 → 0.5.1

package/dist/cli.js

@@ -1,172 +1,22 @@
 #!/usr/bin/env node
-
-// ../../apps/cli/src/index.ts
-import { program as program2 } from "commander";
-
-// ../../apps/cli/src/commands/project.ts
-import { Command } from "commander";
-
-// ../../apps/cli/src/api.ts
-import { program } from "commander";
-function getApiUrl() {
-  const opts = program.opts();
-  return opts.api ?? "http://localhost:4000";
-}
-async function apiFetch(path4, init) {
-  const url = `${getApiUrl()}${path4}`;
-  const res = await fetch(url, init);
-  const data = await res.json().catch(() => ({}));
-  if (!res.ok) {
-    const message = typeof data === "object" && data !== null && "error" in data && typeof data.error === "string" ? data.error : `HTTP ${res.status.toString()}`;
-    throw new Error(message);
-  }
-  return data;
-}
-
-// ../../apps/cli/src/commands/project.ts
-var projectCmd = new Command("project").description("Manage projects");
-projectCmd.command("add").description("Add a project").requiredOption("--name <name>", "project name").requiredOption("--path <path>", "project directory path").option("--repoUrl <url>", "repository URL").option("--description <text>", "project description").action(async (opts) => {
-  const project = await apiFetch("/projects", {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({
-      name: opts.name,
-      path: opts.path,
-      repoUrl: opts.repoUrl,
-      description: opts.description
-    })
-  });
-  console.log(JSON.stringify(project, null, 2));
-});
-projectCmd.command("list").description("List projects").action(async () => {
-  const projects = await apiFetch("/projects");
-  console.log(JSON.stringify(projects, null, 2));
-});
-projectCmd.command("remove").description("Remove a project").argument("<id>", "project id").action(async (id) => {
-  await apiFetch(`/projects/${id}`, { method: "DELETE" });
-  console.log("Project removed.");
-});
-
-// ../../apps/cli/src/commands/task.ts
-import { Command as Command3 } from "commander";
-
-// ../../apps/cli/src/commands/task-feed.ts
-import { Command as Command2 } from "commander";
-import * as grpc from "@grpc/grpc-js";
-import * as protoLoader from "@grpc/proto-loader";
-
-// ../../apps/cli/src/lib/proto-path.ts
-import { existsSync } from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-var __filename = fileURLToPath(import.meta.url);
-var __dirname = path.dirname(__filename);
-function findProtoPath() {
-  const candidates = [
-    // Bundled / installed package layout: dist/proto/tasks.proto
-    path.join(__dirname, "proto/tasks.proto"),
-    // Development layout from apps/cli/src/lib: ../../../../proto/tasks.proto
-    path.resolve(__dirname, "../../../../proto/tasks.proto")
-  ];
-  for (const candidate of candidates) {
-    if (existsSync(candidate)) return candidate;
-  }
-  return candidates[0] ?? "proto/tasks.proto";
-}
-
-// ../../apps/cli/src/commands/task-feed.ts
-var GRPC_TARGET = process.env.HARNESS_GRPC_TARGET ?? "localhost:50051";
-var packageDefinition = protoLoader.loadSync(findProtoPath(), {
-  keepCase: true,
-  longs: String,
-  enums: String,
-  defaults: true,
-  oneofs: true
-});
-var proto = grpc.loadPackageDefinition(packageDefinition);
-var taskFeedCmd = new Command2("feed").description("Feed a task into the harness via gRPC").requiredOption("--project <id>", "project id").requiredOption("--title <title>", "task title").option("--description <text>", "task description").option("--complexity <level>", "simple | medium | complex", "simple").option("--tags <tags>", "comma-separated tags").option("--auto-run", "run the task immediately after submission", false).option("--stream", "stream task updates after submission", false).action(
-  (opts) => {
-    const client = new proto.omega.TaskIngestion(
-      GRPC_TARGET,
-      grpc.credentials.createInsecure()
-    );
-    const request = {
-      project_id: opts.project,
-      title: opts.title,
-      description: opts.description ?? "",
-      complexity: opts.complexity,
-      tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : [],
-      auto_run: opts.autoRun
-    };
-    if (opts.stream) {
-      const call = client.streamTasks();
-      call.on("data", (event) => {
-        console.log(JSON.stringify(event, null, 2));
-      });
-      call.on("error", (err) => {
-        console.error("Stream error:", err.message);
-        process.exit(1);
-      });
-      call.on("end", () => {
-        process.exit(0);
-      });
-      call.write({ project_id: opts.project });
-    }
-    client.submitTask(request, (err, response) => {
-      if (err) {
-        console.error("gRPC error:", err.message);
-        process.exit(1);
-      }
-      console.log(JSON.stringify(response, null, 2));
-      if (!opts.stream) {
-        client.close();
-      }
-    });
-  }
-);
-
-// ../../apps/cli/src/commands/task.ts
-var taskCmd = new Command3("task").description("Manage tasks");
-taskCmd.command("create").description("Create a task").requiredOption("--project <id>", "project id").requiredOption("--title <title>", "task title").option("--description <text>", "task description").option("--complexity <level>", "simple | medium | complex", "simple").option("--tags <tags>", "comma-separated tags").action(async (opts) => {
-  const task = await apiFetch("/tasks", {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({
-      projectId: opts.project,
-      title: opts.title,
-      description: opts.description,
-      complexity: opts.complexity,
-      tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : []
-    })
-  });
-  console.log(JSON.stringify(task, null, 2));
-});
-taskCmd.command("list").description("List tasks").option("--project <id>", "filter by project id").action(async (opts) => {
-  const query = opts.project ? `?projectId=${opts.project}` : "";
-  const tasks = await apiFetch(`/tasks${query}`);
-  console.log(JSON.stringify(tasks, null, 2));
-});
-taskCmd.command("run").description("Run a task through the router").argument("<id>", "task id").action(async (id) => {
-  const result = await apiFetch(`/tasks/${id}/run`, { method: "POST" });
-  console.log(JSON.stringify(result, null, 2));
-});
-taskCmd.addCommand(taskFeedCmd);
-
-// ../../apps/cli/src/commands/ui.ts
-import { Command as Command4 } from "commander";
-import { spawn } from "child_process";
-import { existsSync as existsSync2 } from "fs";
-import path2 from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
-import open from "open";
-import { render } from "ink";
-import React2 from "react";
+var __defProp = Object.defineProperty;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __esm = (fn, res) => function __init() {
+  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 
 // ../../apps/cli/src/commands/tui.tsx
+var tui_exports = {};
+__export(tui_exports, {
+  TuiApp: () => TuiApp
+});
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useApp, useInput, useWindowSize } from "ink";
 import { jsx, jsxs } from "react/jsx-runtime";
-var API = process.env.HARNESS_API_URL ?? "http://localhost:4000";
 function formatTime(d) {
   return d.toLocaleTimeString("en-US", { hour12: false });
 }
@@ -414,46 +264,239 @@ function TuiApp() {
     /* @__PURE__ */ jsx(Box, { height: 1, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "q/esc quit  \u2022  t toggle tasks  \u2022  s toggle sidebar" }) })
   ] });
 }
+var API;
+var init_tui = __esm({
+  "../../apps/cli/src/commands/tui.tsx"() {
+    "use strict";
+    API = process.env.HARNESS_API_URL ?? "http://localhost:4000";
+  }
+});
+
+// ../../apps/cli/src/index.ts
+import { program as program2 } from "commander";
+
+// ../../apps/cli/src/commands/project.ts
+import { Command } from "commander";
+
+// ../../apps/cli/src/api.ts
+import { program } from "commander";
+function getApiUrl() {
+  const opts = program.opts();
+  return opts.api ?? "http://localhost:4000";
+}
+async function apiFetch(path4, init) {
+  const url = `${getApiUrl()}${path4}`;
+  const res = await fetch(url, init);
+  const data = await res.json().catch(() => ({}));
+  if (!res.ok) {
+    const message = typeof data === "object" && data !== null && "error" in data && typeof data.error === "string" ? data.error : `HTTP ${res.status.toString()}`;
+    throw new Error(message);
+  }
+  return data;
+}
+
+// ../../apps/cli/src/commands/project.ts
+var projectCmd = new Command("project").description("Manage projects");
+projectCmd.command("add").description("Add a project").requiredOption("--name <name>", "project name").requiredOption("--path <path>", "project directory path").option("--repoUrl <url>", "repository URL").option("--description <text>", "project description").action(async (opts) => {
+  const project = await apiFetch("/projects", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      name: opts.name,
+      path: opts.path,
+      repoUrl: opts.repoUrl,
+      description: opts.description
+    })
+  });
+  console.log(JSON.stringify(project, null, 2));
+});
+projectCmd.command("list").description("List projects").action(async () => {
+  const projects = await apiFetch("/projects");
+  console.log(JSON.stringify(projects, null, 2));
+});
+projectCmd.command("remove").description("Remove a project").argument("<id>", "project id").action(async (id) => {
+  await apiFetch(`/projects/${id}`, { method: "DELETE" });
+  console.log("Project removed.");
+});
+
+// ../../apps/cli/src/commands/task.ts
+import { Command as Command3 } from "commander";
+
+// ../../apps/cli/src/commands/task-feed.ts
+import { Command as Command2 } from "commander";
+import * as grpc from "@grpc/grpc-js";
+import * as protoLoader from "@grpc/proto-loader";
+
+// ../../apps/cli/src/lib/proto-path.ts
+import { existsSync } from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+var __filename = fileURLToPath(import.meta.url);
+var __dirname = path.dirname(__filename);
+function findProtoPath() {
+  const candidates = [
+    // Bundled / installed package layout: dist/proto/tasks.proto
+    path.join(__dirname, "proto/tasks.proto"),
+    // Development layout from apps/cli/src/lib: ../../../../proto/tasks.proto
+    path.resolve(__dirname, "../../../../proto/tasks.proto")
+  ];
+  for (const candidate of candidates) {
+    if (existsSync(candidate)) return candidate;
+  }
+  return candidates[0] ?? "proto/tasks.proto";
+}
+
+// ../../apps/cli/src/commands/task-feed.ts
+var GRPC_TARGET = process.env.HARNESS_GRPC_TARGET ?? "localhost:50051";
+var packageDefinition = protoLoader.loadSync(findProtoPath(), {
+  keepCase: true,
+  longs: String,
+  enums: String,
+  defaults: true,
+  oneofs: true
+});
+var proto = grpc.loadPackageDefinition(packageDefinition);
+var taskFeedCmd = new Command2("feed").description("Feed a task into the harness via gRPC").requiredOption("--project <id>", "project id").requiredOption("--title <title>", "task title").option("--description <text>", "task description").option("--complexity <level>", "simple | medium | complex", "simple").option("--tags <tags>", "comma-separated tags").option("--auto-run", "run the task immediately after submission", false).option("--stream", "stream task updates after submission", false).action(
+  (opts) => {
+    const client = new proto.omega.TaskIngestion(
+      GRPC_TARGET,
+      grpc.credentials.createInsecure()
+    );
+    const request = {
+      project_id: opts.project,
+      title: opts.title,
+      description: opts.description ?? "",
+      complexity: opts.complexity,
+      tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : [],
+      auto_run: opts.autoRun
+    };
+    if (opts.stream) {
+      const call = client.streamTasks();
+      call.on("data", (event) => {
+        console.log(JSON.stringify(event, null, 2));
+      });
+      call.on("error", (err) => {
+        console.error("Stream error:", err.message);
+        process.exit(1);
+      });
+      call.on("end", () => {
+        process.exit(0);
+      });
+      call.write({ project_id: opts.project });
+    }
+    client.submitTask(request, (err, response) => {
+      if (err) {
+        console.error("gRPC error:", err.message);
+        process.exit(1);
+      }
+      console.log(JSON.stringify(response, null, 2));
+      if (!opts.stream) {
+        client.close();
+      }
+    });
+  }
+);
+
+// ../../apps/cli/src/commands/task.ts
+var taskCmd = new Command3("task").description("Manage tasks");
+taskCmd.command("create").description("Create a task").requiredOption("--project <id>", "project id").requiredOption("--title <title>", "task title").option("--description <text>", "task description").option("--complexity <level>", "simple | medium | complex", "simple").option("--tags <tags>", "comma-separated tags").action(async (opts) => {
+  const task = await apiFetch("/tasks", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      projectId: opts.project,
+      title: opts.title,
+      description: opts.description,
+      complexity: opts.complexity,
+      tags: opts.tags ? opts.tags.split(",").map((t) => t.trim()) : []
+    })
+  });
+  console.log(JSON.stringify(task, null, 2));
+});
+taskCmd.command("list").description("List tasks").option("--project <id>", "filter by project id").action(async (opts) => {
+  const query = opts.project ? `?projectId=${opts.project}` : "";
+  const tasks = await apiFetch(`/tasks${query}`);
+  console.log(JSON.stringify(tasks, null, 2));
+});
+taskCmd.command("run").description("Run a task through the router").argument("<id>", "task id").action(async (id) => {
+  const result = await apiFetch(`/tasks/${id}/run`, { method: "POST" });
+  console.log(JSON.stringify(result, null, 2));
+});
+taskCmd.addCommand(taskFeedCmd);
 
 // ../../apps/cli/src/commands/ui.ts
+import { Command as Command4 } from "commander";
+import { spawn } from "child_process";
+import { existsSync as existsSync2 } from "fs";
+import net from "net";
+import path2 from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+import open from "open";
+import { render } from "ink";
+import React2 from "react";
 var __filename2 = fileURLToPath2(import.meta.url);
 var __dirname2 = path2.dirname(__filename2);
-var API2 = process.env.HARNESS_API_URL ?? "http://localhost:4000";
-function startBundledServer() {
+var DEFAULT_PORT = 4e3;
+var MAX_PORT = 4010;
+function findAvailablePort(preferred = DEFAULT_PORT, max = MAX_PORT) {
+  return new Promise((resolve, reject) => {
+    if (preferred > max) {
+      reject(new Error(`No available ports between ${DEFAULT_PORT.toString()} and ${max.toString()}`));
+      return;
+    }
+    const tester = net.createServer();
+    tester.once("error", (err) => {
+      if (err.code === "EADDRINUSE") {
+        findAvailablePort(preferred + 1, max).then(resolve, reject);
+      } else {
+        reject(err);
+      }
+    });
+    tester.once("listening", () => {
+      const address = tester.address();
+      const port = typeof address === "object" && address ? address.port : preferred;
+      tester.close(() => {
+        resolve(port);
+      });
+    });
+    tester.listen(preferred);
+  });
+}
+function startBundledServer(env) {
   const serverPath = path2.resolve(__dirname2, "server.js");
   if (existsSync2(serverPath)) {
-    return spawn(process.execPath, [serverPath], { stdio: "inherit" });
+    return spawn(process.execPath, [serverPath], { stdio: "inherit", env });
   }
   return void 0;
 }
-async function isApiReady() {
+async function isApiReady(apiUrl) {
   try {
-    const res = await fetch(`${API2}/projects`);
+    const res = await fetch(`${apiUrl}/projects`);
     return res.ok;
   } catch {
     return false;
   }
 }
-async function waitForApi(maxMs = 15e3) {
+async function waitForApi(apiUrl, maxMs = 15e3) {
   const deadline = Date.now() + maxMs;
   while (Date.now() < deadline) {
-    if (await isApiReady()) return;
+    if (await isApiReady(apiUrl)) return;
     await new Promise((r) => setTimeout(r, 300));
   }
   throw new Error("Server did not become ready in time");
 }
-async function ensureProject() {
+async function ensureProject(apiUrl) {
   const cwd = process.cwd();
   const name = path2.basename(cwd);
   try {
-    const listRes = await fetch(`${API2}/projects`);
+    const listRes = await fetch(`${apiUrl}/projects`);
     const projects = await listRes.json();
     const existing = projects.find((p) => p.path === cwd);
     if (existing) {
       console.log(`Using existing project: ${name}`);
       return;
     }
-    const createRes = await fetch(`${API2}/projects`, {
+    const createRes = await fetch(`${apiUrl}/projects`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({ name, path: cwd })
@@ -468,24 +511,31 @@ async function ensureProject() {
   }
 }
 var uiCmd = new Command4("ui").description("Open the harness web UI").option("--no-tui", "Do not open the terminal console alongside the web UI").action(async (options) => {
-  let server = void 0;
-  const alreadyRunning = await isApiReady();
+  const defaultApiUrl = process.env.HARNESS_API_URL ?? `http://localhost:${DEFAULT_PORT.toString()}`;
+  let server;
+  const alreadyRunning = await isApiReady(defaultApiUrl);
   const useTui = options.tui;
+  let apiUrl = defaultApiUrl;
   if (!alreadyRunning) {
-    server = startBundledServer() ?? spawn("pnpm", ["--filter", "@omega/server", "dev"], {
+    const port = await findAvailablePort();
+    apiUrl = `http://localhost:${port.toString()}`;
+    process.env.HARNESS_API_URL = apiUrl;
+    const env = { ...process.env, PORT: port.toString(), HARNESS_API_URL: apiUrl };
+    server = startBundledServer(env) ?? spawn("pnpm", ["--filter", "@omega/server", "dev"], {
       stdio: "inherit",
-      shell: true
+      shell: true,
+      env
     });
     server.on("exit", (code) => {
       process.exit(code ?? 0);
     });
   } else {
-    console.log("Using existing harness server on port 4000");
+    console.log(`Using existing harness server on ${defaultApiUrl}`);
   }
   try {
-    await waitForApi();
-    await ensureProject();
-    await open(API2);
+    await waitForApi(apiUrl);
+    await ensureProject(apiUrl);
+    await open(apiUrl);
   } catch (err) {
     console.error(err);
     server?.kill();
@@ -496,7 +546,8 @@ var uiCmd = new Command4("ui").description("Open the harness web UI").option("--
       console.log("Terminal is not interactive; skipping TUI. Open the web UI above.");
       return;
     }
-    const { waitUntilExit } = render(React2.createElement(TuiApp));
+    const { TuiApp: TuiApp2 } = await Promise.resolve().then(() => (init_tui(), tui_exports));
+    const { waitUntilExit } = render(React2.createElement(TuiApp2));
     await waitUntilExit();
     if (server && !alreadyRunning) {
       server.kill();
@@ -505,6 +556,7 @@ var uiCmd = new Command4("ui").description("Open the harness web UI").option("--
 });
 
 // ../../apps/cli/src/commands/console.ts
+init_tui();
 import { Command as Command5 } from "commander";
 import { render as render2 } from "ink";
 import React3 from "react";

package/dist/server.js

@@ -352,7 +352,7 @@ if (process.env.KIMI_API_KEY) {
     id: "default-kimi",
     name: "kimi",
     kind: "kimi",
-    baseUrl: "https://api.moonshot.cn/v1",
+    baseUrl: "https://api.kimi.com/coding/v1",
     apiKey: process.env.KIMI_API_KEY,
     defaultModel: "moonshot-v1-8k",
     capabilities: [{ name: "moonshot-v1-8k", level: "advanced" }],

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@castlemilk/omega",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Omega Harness CLI - installable via npx",
   "type": "module",
   "main": "./dist/cli.js",
   "bin": {
-    "harness": "./dist/cli.js",
-    "omega-harness": "./dist/cli.js"
+    "harness": "dist/cli.js",
+    "omega-harness": "dist/cli.js"
   },
   "files": [
     "dist"