neko-harness 0.1.0 → 0.2.0

package/dist/client/index.html

@@ -9,8 +9,8 @@
 			href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Crect width='100' height='100' rx='26' fill='%23ffb7c5'/%3E%3Ctext x='50' y='70' font-size='58' text-anchor='middle' fill='%23ffffff' font-family='sans-serif' font-weight='bold'%3En%3C/text%3E%3C/svg%3E"
 		/>
 		<title>neko harness</title>
-		<script type="module" crossorigin src="/assets/index-B1I59uXv.js"></script>
-		<link rel="stylesheet" crossorigin href="/assets/index-U3kl-2BJ.css">
+		<script type="module" crossorigin src="/assets/index-D6NpJLXy.js"></script>
+		<link rel="stylesheet" crossorigin href="/assets/index-CxnbrvVk.css">
 	</head>
 	<body>
 		<div id="root"></div>

package/dist/gateway.js

@@ -1,10 +1,113 @@
 #!/usr/bin/env bun
 // @bun
 
+// packages/gateway/src/cli-args.ts
+var GATEWAY_USAGE = `\u7528\u6CD5: main.ts [\u9009\u9879]
+
+\u9009\u9879:
+  --host <ip>          WebSocket \u76D1\u542C\u5730\u5740\uFF08\u9ED8\u8BA4 127.0.0.1\uFF0C\u4EC5\u672C\u673A\uFF09
+  --port <n>           WebSocket \u76D1\u542C\u7AEF\u53E3\uFF08\u9ED8\u8BA4 8321\uFF0CWindows \u9ED8\u8BA4\u968F\u673A\uFF1B0/null \u7981\u7528 WS\uFF09
+  --socket-path <path> Unix socket \u8DEF\u5F84\uFF08\u9ED8\u8BA4 <\u6570\u636E\u76EE\u5F55>/<serverId>.sock\uFF1BWindows \u9ED8\u8BA4\u7981\u7528\uFF09
+  --no-socket          \u7981\u7528 Unix socket \u4F20\u8F93\uFF08\u4EC5 WebSocket\uFF09
+  --server-id <id>     \u903B\u8F91\u670D\u52A1\u5668\u8EAB\u4EFD\uFF08\u9ED8\u8BA4\u8BFB\u53D6/\u751F\u6210 <\u6570\u636E\u76EE\u5F55>/gateway-server-id\uFF09
+  --cwd <dir>          \u4F1A\u8BDD\u5DE5\u5177\u7684\u5DE5\u4F5C\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09
+  --model <ref>        \u6A21\u578B\uFF0C\u683C\u5F0F provider/modelId\uFF08\u9ED8\u8BA4 deepseek/deepseek-flash\uFF09
+  --storage <path>     SQLite \u5B58\u50A8\u6587\u4EF6\uFF08\u9ED8\u8BA4 ~/.neko/neko.sqlite\uFF09
+  --credentials <path> \u7528\u6237\u51ED\u636E\u6587\u4EF6\uFF08\u9ED8\u8BA4 ~/.neko/credentials.json\uFF09
+  --config <dir>       neko.config.json \u67E5\u627E\u8D77\u59CB\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09
+  -h, --help           \u663E\u793A\u6B64\u5E2E\u52A9
+
+\u53EF\u901A\u8FC7\u524D\u7AEF\u8BBE\u7F6E\u6216 DEEPSEEK_API_KEY \u914D\u7F6E\u51ED\u636E\u3002`;
+function parseGatewayArgs(argv) {
+  let port;
+  const options = {};
+  for (let i = 0;i < argv.length; i++) {
+    const arg = argv[i];
+    const next = argv[i + 1];
+    switch (arg) {
+      case "--host":
+        if (next === undefined)
+          throw new Error("--host \u9700\u8981\u53C2\u6570");
+        options.host = next;
+        i++;
+        break;
+      case "--port": {
+        if (next === undefined)
+          throw new Error("--port \u9700\u8981\u53C2\u6570");
+        if (next === "0" || next === "null") {
+          port = null;
+        } else {
+          const parsed = Number(next);
+          if (!Number.isInteger(parsed) || parsed < 0 || parsed > 65535) {
+            throw new Error(`--port \u9700\u8981 0-65535 \u7684\u6574\u6570: ${next}`);
+          }
+          port = parsed;
+        }
+        i++;
+        break;
+      }
+      case "--socket-path":
+        if (next === undefined)
+          throw new Error("--socket-path \u9700\u8981\u53C2\u6570");
+        options.socketPath = next;
+        i++;
+        break;
+      case "--no-socket":
+        options.socketPath = null;
+        break;
+      case "--server-id":
+        if (next === undefined)
+          throw new Error("--server-id \u9700\u8981\u53C2\u6570");
+        options.serverId = next;
+        i++;
+        break;
+      case "--cwd":
+        if (next === undefined)
+          throw new Error("--cwd \u9700\u8981\u53C2\u6570");
+        options.cwd = next;
+        i++;
+        break;
+      case "--model": {
+        if (next === undefined)
+          throw new Error("--model \u9700\u8981\u53C2\u6570");
+        const slash = next.indexOf("/");
+        if (slash <= 0 || slash === next.length - 1)
+          throw new Error(`--model \u683C\u5F0F\u4E3A provider/modelId: ${next}`);
+        options.model = { provider: next.slice(0, slash), modelId: next.slice(slash + 1) };
+        i++;
+        break;
+      }
+      case "--credentials":
+        if (next === undefined)
+          throw new Error("--credentials \u9700\u8981\u53C2\u6570");
+        options.credentialsPath = next;
+        i++;
+        break;
+      case "--storage":
+        if (next === undefined)
+          throw new Error("--storage \u9700\u8981\u53C2\u6570");
+        options.storagePath = next;
+        i++;
+        break;
+      case "--config":
+        if (next === undefined)
+          throw new Error("--config \u9700\u8981\u53C2\u6570");
+        options.configDir = next;
+        i++;
+        break;
+      default:
+        throw new Error(`\u672A\u77E5\u9009\u9879: ${arg}`);
+    }
+  }
+  if (port !== undefined)
+    options.port = port;
+  return options;
+}
+
 // packages/gateway/src/gateway.ts
 import { randomUUID } from "crypto";
-import { mkdir as mkdir2, readFile as readFile4, writeFile } from "fs/promises";
-import { basename as basename4, dirname as dirname6, join as join8 } from "path";
+import { mkdir as mkdir2, readFile as readFile5, writeFile as writeFile2 } from "fs/promises";
+import { basename as basename4, dirname as dirname6, join as join9 } from "path";
 import { BACKGROUND_CONTEXT as BACKGROUND_CONTEXT2 } from "@earendil-works/chord/context";
 import { isServerId } from "@earendil-works/pi-protocol";
 import { Server, SessionNotFoundError } from "@earendil-works/pi-server";
@@ -217,8 +320,8 @@ function validate(config, source) {
     if (port !== undefined && (!Number.isInteger(port) || port < 0 || port > 65535)) {
       throw new Error(`neko config: ${source}: "gateway.port" must be an integer between 0 and 65535.`);
     }
-    if (socketPath !== undefined && typeof socketPath !== "string") {
-      throw new Error(`neko config: ${source}: "gateway.socketPath" must be a string.`);
+    if (socketPath !== undefined && socketPath !== null && typeof socketPath !== "string") {
+      throw new Error(`neko config: ${source}: "gateway.socketPath" must be a string or null.`);
     }
   }
   const theme = config.theme;
@@ -1897,7 +2000,10 @@ async function createNekoRuntime(options = {}) {
     conversationCreated: async (tx, record) => {
       (await tx.doc(SessionMetadataDoc, record.id)).createdAt = Date.now();
     },
-    env: ({ cwd }) => new NodeExecutionEnv({ cwd: executionWorkspace(cwd) })
+    env: ({ cwd }) => new NodeExecutionEnv({
+      cwd: executionWorkspace(cwd),
+      ...process.platform === "win32" ? { shellEnv: { PYTHONIOENCODING: "utf-8", PYTHONUTF8: "1" } } : {}
+    })
   }, context);
   const scanConversations = () => harness.commit(async (tx) => {
     const records = [];
@@ -2323,6 +2429,20 @@ async function createNekoRuntime(options = {}) {
     }
   };
 }
+// packages/gateway/src/port-file.ts
+import { readFile as readFile4, rm, writeFile } from "fs/promises";
+import { join as join6 } from "path";
+function gatewayPortFilePath(nekoDir, serverId) {
+  return join6(nekoDir, `${serverId}.port`);
+}
+async function writeGatewayPortFile(nekoDir, serverId, wsUrl) {
+  await writeFile(gatewayPortFilePath(nekoDir, serverId), `${wsUrl}
+`, { mode: 384 });
+}
+async function removeGatewayPortFile(nekoDir, serverId) {
+  await rm(gatewayPortFilePath(nekoDir, serverId), { force: true });
+}
+
 // packages/gateway/src/server-services.ts
 import {
   createRemoteServiceEndpoint,
@@ -2334,13 +2454,13 @@ import {
 import { spawn } from "child_process";
 import { accessSync as accessSync2, constants as constants2 } from "fs";
 import { realpath, stat } from "fs/promises";
-import { basename as basename2, delimiter, isAbsolute as isAbsolute2, join as join6, relative, resolve as resolve4, sep } from "path";
+import { basename as basename2, delimiter, isAbsolute as isAbsolute2, join as join7, relative, resolve as resolve4, sep } from "path";
 function findFd() {
   for (const name of process.platform === "win32" ? ["fd.exe", "fdfind.exe"] : ["fd", "fdfind"]) {
     for (const directory of (process.env.PATH ?? "").split(delimiter)) {
       if (!directory)
         continue;
-      const path = join6(directory, name);
+      const path = join7(directory, name);
       try {
         accessSync2(path, constants2.X_OK);
         return path;
@@ -2459,11 +2579,15 @@ var NekoWorkspaceFiles = defineService("neko.workspace-files");
 // packages/gateway/src/workspaces.ts
 import { constants as constants3 } from "fs";
 import { access, readdir as readdir2, stat as stat2 } from "fs/promises";
-import { dirname as dirname5, isAbsolute as isAbsolute3, join as join7 } from "path";
+import { dirname as dirname5, isAbsolute as isAbsolute3, join as join8 } from "path";
 async function browseWorkspaces(options) {
-  if (!isAbsolute3(options.path))
+  const requested = options.path.replace(/^\/+([A-Za-z]:[\\/])/, "$1");
+  if (process.platform === "win32" && (requested === "/" || requested === "\\")) {
+    return { path: "/", parent: null, entries: await listDrives(), next: null };
+  }
+  if (!isAbsolute3(requested))
     throw new Error("\u8BF7\u9009\u62E9\u5B8C\u6574\u7684\u7EDD\u5BF9\u76EE\u5F55\u8DEF\u5F84");
-  const path = accessibleWorkspace(options.path);
+  const path = accessibleWorkspace(requested);
   const query = options.query?.toLowerCase() ?? "";
   const key = JSON.stringify([path, query, options.showHidden === true]);
   let offset = 0;
@@ -2482,7 +2606,7 @@ async function browseWorkspaces(options) {
   let next = offset;
   for (;next < entries.length && directories.length < 100; next++) {
     const entry = entries[next];
-    const target = join7(path, entry.name);
+    const target = join8(path, entry.name);
     if (!entry.isDirectory() && !entry.isSymbolicLink())
       continue;
     try {
@@ -2501,6 +2625,17 @@ async function browseWorkspaces(options) {
     next: next < entries.length ? JSON.stringify({ key, offset: next }) : null
   };
 }
+async function listDrives() {
+  const drives = [];
+  for (const letter of "ABCDEFGHIJKLMNOPQRSTUVWXYZ") {
+    const root = `${letter}:\\`;
+    try {
+      await access(root);
+      drives.push({ name: `${letter}:`, path: root });
+    } catch {}
+  }
+  return drives;
+}
 
 // packages/gateway/src/server-services.ts
 async function createNekoServerServices(options) {
@@ -3123,10 +3258,10 @@ async function startGateway(options = {}) {
   const model = options.model ?? fileConfig.defaultModel ?? DEFAULT_MODEL;
   const storagePath = options.storagePath ?? fileConfig.storagePath ?? DEFAULT_STORAGE_PATH;
   const host = options.host ?? fileConfig.gateway?.host ?? DEFAULT_HOST;
-  const port = options.port !== undefined ? options.port : fileConfig.gateway?.port ?? DEFAULT_PORT;
+  const port = options.port !== undefined ? options.port : fileConfig.gateway?.port ?? (process.platform === "win32" ? 0 : DEFAULT_PORT);
   const nekoDir = dirname6(storagePath);
   const serverId = options.serverId ?? await loadOrCreateServerId(nekoDir);
-  const socketPath = options.socketPath !== undefined ? options.socketPath : fileConfig.gateway?.socketPath ?? join8(nekoDir, `${serverId}.sock`);
+  const socketPath = options.socketPath !== undefined ? options.socketPath : fileConfig.gateway?.socketPath !== undefined ? fileConfig.gateway.socketPath : process.platform === "win32" ? null : join9(nekoDir, `${serverId}.sock`);
   const runtime = await createNekoRuntime({
     context,
     storage: options.storage ?? "sqlite",
@@ -3147,6 +3282,7 @@ async function startGateway(options = {}) {
       port,
       socketPath,
       serverId,
+      nekoDir,
       model,
       onError: options.onError
     });
@@ -3156,7 +3292,7 @@ async function startGateway(options = {}) {
   }
 }
 async function bindGateway(runtime, options) {
-  const { context, host, port, socketPath, serverId, model } = options;
+  const { context, host, port, socketPath, serverId, nekoDir, model } = options;
   const modelLabel = `${model.provider}/${model.modelId}`;
   const serverServices = await createNekoServerServices({ runtime, context });
   let wsListener;
@@ -3189,6 +3325,10 @@ async function bindGateway(runtime, options) {
     await serverServices.dispose().catch(() => {});
     throw toStartupError(error, { socketPath, port, host, serverId });
   }
+  const portFile = process.platform === "win32" && wsListener !== undefined ? { nekoDir, serverId } : undefined;
+  if (portFile !== undefined && wsListener !== undefined) {
+    await writeGatewayPortFile(portFile.nekoDir, portFile.serverId, `ws://${host}:${wsListener.port}`);
+  }
   let closed = false;
   return {
     serverId,
@@ -3200,6 +3340,8 @@ async function bindGateway(runtime, options) {
       if (closed)
         return;
       closed = true;
+      if (portFile !== undefined)
+        await removeGatewayPortFile(portFile.nekoDir, portFile.serverId).catch(() => {});
       await server.close();
       await serverServices.dispose();
       await runtime.close();
@@ -3209,7 +3351,8 @@ async function bindGateway(runtime, options) {
 function toStartupError(error, info) {
   const message = error instanceof Error ? error.message : String(error);
   const existingServerId = info.socketPath === null ? undefined : serverIdFromSocketPath(info.socketPath);
-  const connectHint = existingServerId !== undefined ? `\u5982\u9700\u8FDE\u63A5\u5DF2\u6709\u5B9E\u4F8B\uFF1AUnix socket ${info.socketPath}\uFF08serverId: ${existingServerId}\uFF09\uFF0C\u6216\u505C\u6389\u5360\u7528\u65B9\u540E\u91CD\u8BD5\u3002` : `\u5982\u9700\u8FDE\u63A5\u5DF2\u6709\u5B9E\u4F8B\uFF1AUnix socket ${info.socketPath ?? "\uFF08\u672A\u542F\u7528\uFF09"}\uFF0C\u6216\u505C\u6389\u5360\u7528\u65B9\u540E\u91CD\u8BD5\u3002`;
+  const existingAddress = info.socketPath !== null ? `Unix socket ${info.socketPath}${existingServerId !== undefined ? `\uFF08serverId: ${existingServerId}\uFF09` : ""}` : process.platform === "win32" ? `\u7AEF\u53E3\u6587\u4EF6 <\u6570\u636E\u76EE\u5F55>/${info.serverId}.port \u4E2D\u7684 ws \u5730\u5740` : "Unix socket\uFF08\u672A\u542F\u7528\uFF09";
+  const connectHint = `\u5982\u9700\u8FDE\u63A5\u5DF2\u6709\u5B9E\u4F8B\uFF1A${existingAddress}\uFF0C\u6216\u505C\u6389\u5360\u7528\u65B9\u540E\u91CD\u8BD5\u3002`;
   if (message.includes("already running")) {
     return new Error(`neko gateway \u542F\u52A8\u5931\u8D25\uFF1A${message}
 \u8BE5\u5730\u5740\u5DF2\u88AB\u4E00\u4E2A\u6D3B\u8DC3\u7F51\u5173\u5360\u7528\uFF0C\u4E0D\u80FD\u542F\u52A8\u7B2C\u4E8C\u4E2A\u5B9E\u4F8B\u3002
@@ -3229,123 +3372,26 @@ function serverIdFromSocketPath(socketPath) {
   return isServerId(candidate) ? candidate : undefined;
 }
 async function loadOrCreateServerId(nekoDir) {
-  const file = join8(nekoDir, SERVER_ID_FILENAME);
+  const file = join9(nekoDir, SERVER_ID_FILENAME);
   try {
-    const existing = (await readFile4(file, "utf8")).trim();
+    const existing = (await readFile5(file, "utf8")).trim();
     if (existing !== "")
       return existing;
   } catch {}
   const created = randomUUID();
   await mkdir2(nekoDir, { recursive: true, mode: 448 });
-  await writeFile(file, `${created}
+  await writeFile2(file, `${created}
 `, { mode: 384 });
   return created;
 }
 
 // packages/gateway/src/main.ts
-var USAGE = `\u7528\u6CD5: main.ts [\u9009\u9879]
-
-\u9009\u9879:
-  --host <ip>          WebSocket \u76D1\u542C\u5730\u5740\uFF08\u9ED8\u8BA4 127.0.0.1\uFF0C\u4EC5\u672C\u673A\uFF1B0/null \u7981\u7528 WS\uFF09
-  --port <n>           WebSocket \u76D1\u542C\u7AEF\u53E3\uFF08\u9ED8\u8BA4 8321\uFF1B0 = \u968F\u673A\u5206\u914D\uFF09
-  --socket-path <path> Unix socket \u8DEF\u5F84\uFF08\u9ED8\u8BA4 <\u6570\u636E\u76EE\u5F55>/<serverId>.sock\uFF09
-  --server-id <id>     \u903B\u8F91\u670D\u52A1\u5668\u8EAB\u4EFD\uFF08\u9ED8\u8BA4\u8BFB\u53D6/\u751F\u6210 <\u6570\u636E\u76EE\u5F55>/gateway-server-id\uFF09
-  --cwd <dir>          \u4F1A\u8BDD\u5DE5\u5177\u7684\u5DE5\u4F5C\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09
-  --model <ref>        \u6A21\u578B\uFF0C\u683C\u5F0F provider/modelId\uFF08\u9ED8\u8BA4 deepseek/deepseek-flash\uFF09
-  --storage <path>     SQLite \u5B58\u50A8\u6587\u4EF6\uFF08\u9ED8\u8BA4 ~/.neko/neko.sqlite\uFF09
-  --credentials <path> \u7528\u6237\u51ED\u636E\u6587\u4EF6\uFF08\u9ED8\u8BA4 ~/.neko/credentials.json\uFF09
-  --config <dir>       neko.config.json \u67E5\u627E\u8D77\u59CB\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09
-  -h, --help           \u663E\u793A\u6B64\u5E2E\u52A9
-
-\u53EF\u901A\u8FC7\u524D\u7AEF\u8BBE\u7F6E\u6216 DEEPSEEK_API_KEY \u914D\u7F6E\u51ED\u636E\u3002`;
-function parseArgs(argv) {
-  let port;
-  const options = {};
-  for (let i = 0;i < argv.length; i++) {
-    const arg = argv[i];
-    const next = argv[i + 1];
-    switch (arg) {
-      case "--host":
-        if (next === undefined)
-          throw new Error("--host \u9700\u8981\u53C2\u6570");
-        options.host = next;
-        i++;
-        break;
-      case "--port": {
-        if (next === undefined)
-          throw new Error("--port \u9700\u8981\u53C2\u6570");
-        if (next === "0" || next === "null") {
-          port = null;
-        } else {
-          const parsed = Number(next);
-          if (!Number.isInteger(parsed) || parsed < 0 || parsed > 65535) {
-            throw new Error(`--port \u9700\u8981 0-65535 \u7684\u6574\u6570: ${next}`);
-          }
-          port = parsed;
-        }
-        i++;
-        break;
-      }
-      case "--socket-path":
-        if (next === undefined)
-          throw new Error("--socket-path \u9700\u8981\u53C2\u6570");
-        options.socketPath = next;
-        i++;
-        break;
-      case "--server-id":
-        if (next === undefined)
-          throw new Error("--server-id \u9700\u8981\u53C2\u6570");
-        options.serverId = next;
-        i++;
-        break;
-      case "--cwd":
-        if (next === undefined)
-          throw new Error("--cwd \u9700\u8981\u53C2\u6570");
-        options.cwd = next;
-        i++;
-        break;
-      case "--model": {
-        if (next === undefined)
-          throw new Error("--model \u9700\u8981\u53C2\u6570");
-        const slash = next.indexOf("/");
-        if (slash <= 0 || slash === next.length - 1)
-          throw new Error(`--model \u683C\u5F0F\u4E3A provider/modelId: ${next}`);
-        options.model = { provider: next.slice(0, slash), modelId: next.slice(slash + 1) };
-        i++;
-        break;
-      }
-      case "--credentials":
-        if (next === undefined)
-          throw new Error("--credentials \u9700\u8981\u53C2\u6570");
-        options.credentialsPath = next;
-        i++;
-        break;
-      case "--storage":
-        if (next === undefined)
-          throw new Error("--storage \u9700\u8981\u53C2\u6570");
-        options.storagePath = next;
-        i++;
-        break;
-      case "--config":
-        if (next === undefined)
-          throw new Error("--config \u9700\u8981\u53C2\u6570");
-        options.configDir = next;
-        i++;
-        break;
-      case "-h":
-      case "--help":
-        console.log(USAGE);
-        process.exit(0);
-        break;
-      default:
-        throw new Error(`\u672A\u77E5\u9009\u9879: ${arg}`);
-    }
-  }
-  if (port !== undefined)
-    options.port = port;
-  return options;
+var argv = process.argv.slice(2);
+if (argv.includes("-h") || argv.includes("--help")) {
+  console.log(GATEWAY_USAGE);
+  process.exit(0);
 }
-var options = parseArgs(process.argv.slice(2));
+var options = parseGatewayArgs(argv);
 var gateway = await startGateway({
   ...options,
   onError: (error) => console.error("gateway error:", error.message)