@plurnk/plurnk-service 0.7.0 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@plurnk/plurnk-service",
-    "version": "0.7.0",
+    "version": "0.8.0",
     "description": "Plurnk agent runtime — the server / engine / core. Implements the @plurnk/plurnk-grammar contract.",
     "type": "module",
     "license": "MIT",
@@ -15,10 +15,10 @@
         "./package.json": "./package.json"
     },
     "bin": {
-        "plurnk-service": "./bin/plurnk-service.js"
+        "plurnk-service": "./bin/plurnk-service.ts"
     },
     "files": [
-        "bin/plurnk-service.js",
+        "bin/plurnk-service.ts",
         "dist/**/*",
         "migrations/**/*.sql",
         "persona.md",
@@ -29,16 +29,16 @@
         "access": "public"
     },
     "scripts": {
-        "start": "node bin/plurnk-service.js",
+        "start": "node bin/plurnk-service.ts",
         "test:lint": "tsc --noEmit",
-        "test:unit": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test src/**/*.test.ts",
-        "test:intg": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test test/intg/*.test.ts",
+        "test:unit": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test --test-timeout=30000 src/**/*.test.ts",
+        "test:intg": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test --test-timeout=30000 test/intg/*.test.ts",
         "test:live": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test --test-concurrency=1 test/live/*.test.ts",
         "test:demo": "node --env-file-if-exists=.env.example --env-file-if-exists=.env --env-file-if-exists=.env.test --test --test-concurrency=1 test/demo/*.test.ts",
         "test:all": "npm run test:lint && npm run test:unit && npm run test:intg && npm run test:demo",
-        "test:digest": "node bin/digest.js",
+        "test:digest": "node bin/digest.ts",
         "test:clean-tmp": "rm -rf test/intg/.tmp",
-        "dev:digest": "node bin/digest.js",
+        "dev:digest": "node bin/digest.ts",
         "build:dist": "tsc -p tsconfig.build.json",
         "build": "npm run build:dist",
         "prepare": "npm run build"
@@ -46,29 +46,73 @@
     "dependencies": {
         "@plurnk/plurnk-execs": "0.2.0",
         "@plurnk/plurnk-execs-sh": "0.1.0",
-        "@plurnk/plurnk-grammar": "0.17.1",
-        "@plurnk/plurnk-mimetypes": "0.7.1",
-        "@plurnk/plurnk-mimetypes-application-json": "0.4.0",
-        "@plurnk/plurnk-mimetypes-application-pdf": "0.5.0",
-        "@plurnk/plurnk-mimetypes-application-toml": "0.3.0",
-        "@plurnk/plurnk-mimetypes-application-yaml": "0.3.0",
-        "@plurnk/plurnk-mimetypes-text-csv": "0.3.0",
-        "@plurnk/plurnk-mimetypes-text-html": "0.5.0",
-        "@plurnk/plurnk-mimetypes-text-markdown": "0.5.0",
-        "@plurnk/plurnk-mimetypes-text-plain": "0.6.0",
-        "@plurnk/plurnk-mimetypes-text-python": "0.1.0",
-        "@plurnk/plurnk-mimetypes-text-typescript": "0.3.0",
-        "@plurnk/plurnk-providers": "0.1.3",
-        "@plurnk/plurnk-providers-cloudflare": "0.2.3",
-        "@plurnk/plurnk-providers-google": "0.2.4",
-        "@plurnk/plurnk-providers-ollama": "0.2.3",
+        "@plurnk/plurnk-grammar": "0.21.0",
+        "@plurnk/plurnk-mimetypes": "0.11.0",
+        "@plurnk/plurnk-mimetypes-application-json": "0.5.0",
+        "@plurnk/plurnk-mimetypes-application-pdf": "0.6.0",
+        "@plurnk/plurnk-mimetypes-application-xml": "0.1.0",
+        "@plurnk/plurnk-mimetypes-text-clojure": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-cmake": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-common-lisp": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-csharp": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-csv": "0.4.0",
+        "@plurnk/plurnk-mimetypes-text-datalog": "0.3.0",
+        "@plurnk/plurnk-mimetypes-text-erlang": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-graphql": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-html": "0.6.0",
+        "@plurnk/plurnk-mimetypes-text-mariadb": "0.3.0",
+        "@plurnk/plurnk-mimetypes-text-markdown": "0.6.0",
+        "@plurnk/plurnk-mimetypes-text-plain": "0.7.0",
+        "@plurnk/plurnk-mimetypes-text-plsql": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-postgresql": "0.3.0",
+        "@plurnk/plurnk-mimetypes-text-prolog": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-protobuf": "0.3.0",
+        "@plurnk/plurnk-mimetypes-text-redis": "0.3.0",
+        "@plurnk/plurnk-mimetypes-text-sparql": "0.2.0",
+        "@plurnk/plurnk-mimetypes-text-sqlite": "0.3.0",
+        "@plurnk/plurnk-mimetypes-text-swift": "0.1.0",
+        "@plurnk/plurnk-mimetypes-text-terraform": "0.3.0",
+        "@plurnk/plurnk-mimetypes-text-tsql": "0.2.0",
+        "@plurnk/plurnk-providers": "0.1.4",
+        "@plurnk/plurnk-providers-cloudflare": "0.2.4",
+        "@plurnk/plurnk-providers-google": "0.2.5",
+        "@plurnk/plurnk-providers-ollama": "0.2.4",
         "@plurnk/plurnk-providers-openai": "0.2.0",
-        "@plurnk/plurnk-providers-openrouter": "0.2.3",
-        "@plurnk/plurnk-providers-xai": "0.2.3",
-        "@plurnk/plurnk-schemes": "0.1.2",
-        "@possumtech/sqlrite": "^3.1.0",
-        "diff": "^7.0.0",
-        "ws": "^8.20.1"
+        "@plurnk/plurnk-providers-openrouter": "0.2.4",
+        "@plurnk/plurnk-providers-xai": "0.2.4",
+        "@possumtech/sqlrite": "5.1.1",
+        "@tree-sitter-grammars/tree-sitter-kotlin": "^1.1.0",
+        "@tree-sitter-grammars/tree-sitter-lua": "^0.4.1",
+        "@tree-sitter-grammars/tree-sitter-toml": "^0.7.0",
+        "@tree-sitter-grammars/tree-sitter-yaml": "^0.7.1",
+        "@tree-sitter-grammars/tree-sitter-zig": "^1.1.2",
+        "@xmldom/xmldom": "^0.9.10",
+        "antlr-ng": "^1.0.10",
+        "antlr4ng": "^3.0.16",
+        "diff": "^9.0.0",
+        "tree-sitter-bash": "^0.25.1",
+        "tree-sitter-c": "^0.24.1",
+        "tree-sitter-cpp": "^0.23.4",
+        "tree-sitter-dart": "^1.0.0",
+        "tree-sitter-elixir": "^0.3.5",
+        "tree-sitter-fsharp": "^0.1.0",
+        "tree-sitter-go": "^0.25.0",
+        "tree-sitter-haskell": "^0.23.1",
+        "tree-sitter-java": "^0.23.5",
+        "tree-sitter-javascript": "^0.25.0",
+        "tree-sitter-julia": "^0.23.1",
+        "tree-sitter-make": "^1.1.1",
+        "tree-sitter-ocaml": "^0.24.2",
+        "tree-sitter-odin": "^1.3.0",
+        "tree-sitter-php": "^0.24.2",
+        "tree-sitter-python": "^0.25.0",
+        "tree-sitter-ruby": "^0.23.1",
+        "tree-sitter-rust": "^0.24.0",
+        "tree-sitter-scala": "^0.24.0",
+        "tree-sitter-typescript": "^0.23.2",
+        "web-tree-sitter": "^0.26.9",
+        "ws": "^8.20.1",
+        "xpath": "^0.0.34"
     },
     "devDependencies": {
         "@types/diff": "^7.0.2",

package/bin/plurnk-service.js

@@ -1,112 +0,0 @@
-#!/usr/bin/env node
-
-import { parseArgs } from "node:util";
-import { existsSync } from "node:fs";
-import SqlRite from "@possumtech/sqlrite";
-import { fileURLToPath } from "node:url";
-import { dirname, resolve } from "node:path";
-import Daemon from "../src/server/Daemon.ts";
-import { parseEnvExample, formatFlagsHelp } from "../src/core/EnvFlags.ts";
-import { loadActiveProvider } from "../src/core/ProviderInstantiate.ts";
-import { resolveActiveAlias } from "@plurnk/plurnk-providers";
-
-const die = (code, message) => {
-    process.stderr.write(`${message}\n`);
-    process.exit(code);
-};
-
-const projectRoot = resolve(dirname(fileURLToPath(import.meta.url)), "..");
-
-// Env cascade: .env.example (shipped defaults) < .env (project) < .env.<config> (--config)
-// < shell. process.loadEnvFile is set-if-unset, so loading in low→high precedence
-// order yields the right effective env.
-const configFlagIndex = process.argv.findIndex((a) => a === "--config" || a.startsWith("--config="));
-const configFile = (() => {
-    if (configFlagIndex === -1) return null;
-    const arg = process.argv[configFlagIndex];
-    if (arg.includes("=")) return arg.slice(arg.indexOf("=") + 1);
-    return process.argv[configFlagIndex + 1] ?? null;
-})();
-
-const loadEnv = (path, required) => {
-    if (existsSync(path)) {
-        try { process.loadEnvFile(path); }
-        catch (cause) { die(64, `failed to load ${path}: ${cause instanceof Error ? cause.message : String(cause)}`); }
-    } else if (required) {
-        die(64, `--config: ${path} does not exist`);
-    }
-};
-
-// Highest precedence loads FIRST (set-if-unset semantics: first write wins).
-if (configFile !== null) loadEnv(configFile, true);
-loadEnv(".env", false);
-loadEnv(resolve(projectRoot, ".env.example"), false);
-
-const flagDescriptors = await parseEnvExample(resolve(projectRoot, ".env.example"));
-const flagOptions = {};
-for (const f of flagDescriptors) {
-    flagOptions[f.flagName.replace(/^--/, "")] = { type: "string" };
-}
-
-const USAGE = `usage: plurnk-service [options] [migrate]
-
-${formatFlagsHelp(flagDescriptors)}
-
-  --config=<path>  layer additional env from <path>
-  -h, --help       show this help
-`;
-
-const openDb = async (dbPath) => SqlRite.open({
-    path: dbPath,
-    dir: [resolve(projectRoot, "migrations"), resolve(projectRoot, "src")],
-});
-
-const migrate = async () => {
-    const db = await openDb(process.env.PLURNK_DB_PATH);
-    try { process.stdout.write(`migrated: ${process.env.PLURNK_DB_PATH}\n`); }
-    finally { await db.close(); }
-};
-
-const start = async () => {
-    const dbPath = process.env.PLURNK_DB_PATH;
-    const host = process.env.PLURNK_HOST;
-    const port = Number(process.env.PLURNK_PORT);
-
-    const db = await openDb(dbPath);
-    const alias = resolveActiveAlias();
-    const provider = alias === null ? null : await loadActiveProvider();
-    const daemon = new Daemon({ db, provider });
-    const addr = await daemon.start({ host, port });
-    const aliasStr = alias === null ? "no model" : `${alias.alias}=${alias.provider}/${alias.model}`;
-    process.stdout.write(`plurnk-service ws://${addr.host}:${addr.port} db=${dbPath} ${aliasStr}\n`);
-
-    const shutdown = async () => { await daemon.stop(); await db.close(); process.exit(0); };
-    process.on("SIGINT", shutdown);
-    process.on("SIGTERM", shutdown);
-};
-
-const { positionals, values } = parseArgs({
-    allowPositionals: true,
-    strict: false,
-    options: { help: { type: "boolean", short: "h" }, config: { type: "string" }, ...flagOptions },
-});
-
-for (const f of flagDescriptors) {
-    const key = f.flagName.replace(/^--/, "");
-    if (typeof values[key] === "string") process.env[f.envName] = values[key];
-}
-
-if (values.help) { process.stdout.write(USAGE); process.exit(0); }
-
-const dispatch = { migrate, start };
-const subcommand = positionals[0] ?? "start";
-const handler = dispatch[subcommand];
-if (handler === undefined) die(64, `unknown subcommand: ${subcommand}\n\n${USAGE}`);
-if (positionals.length > 1) die(64, `unexpected arguments: ${positionals.slice(1).join(" ")}`);
-
-try { await handler(); }
-catch (cause) {
-    process.stderr.write(`${subcommand}: ${cause instanceof Error ? cause.message : String(cause)}\n`);
-    if (cause instanceof Error && cause.cause) process.stderr.write(`  cause: ${cause.cause instanceof Error ? cause.cause.message : String(cause.cause)}\n`);
-    process.exit(1);
-}