Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 418d8ee0c8 | |||
| 719c4c1449 | |||
| c8bf4bf547 | |||
| 9b93c4a4d9 | |||
| ca14c5f51d | |||
| 1979e0e16c | |||
| 9102c6698a | |||
| b15fc993f2 | |||
| 6cc8833b2a | |||
| fc76b862ad | |||
| 787e791aba | |||
| 96188c8cda | |||
| f1458f8353 | |||
| 781f571474 | |||
| 640f170de8 | |||
| 119b1f3722 | |||
| 96ea4b46ff | |||
| 57881533a8 | |||
| a62a993a82 |
@@ -0,0 +1,34 @@
|
|||||||
|
---
|
||||||
|
description: Ban dynamic import() in production code — use static imports instead
|
||||||
|
globs: packages/*/src/**/*.ts
|
||||||
|
alwaysApply: true
|
||||||
|
---
|
||||||
|
|
||||||
|
# No Dynamic Import in Production Code
|
||||||
|
|
||||||
|
## Rule
|
||||||
|
|
||||||
|
Do NOT use `await import()` or dynamic `import()` expressions in production source code.
|
||||||
|
Always use static top-level `import` statements.
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
- Static imports enable tree-shaking and bundler optimizations
|
||||||
|
- They make dependencies explicit and discoverable at a glance
|
||||||
|
- Dynamic imports of Node built-ins or project modules add unnecessary async overhead
|
||||||
|
|
||||||
|
## Exceptions (must include a comment explaining why)
|
||||||
|
|
||||||
|
1. **`sense-runtime.ts`** — loads user-authored sense modules whose paths are only known at runtime
|
||||||
|
2. **`workflow-worker.ts`** — loads user-authored workflow modules whose paths are only known at runtime
|
||||||
|
|
||||||
|
When suppressing, add a comment directly above:
|
||||||
|
|
||||||
|
```ts
|
||||||
|
// Dynamic import required: user module path resolved at runtime
|
||||||
|
const mod = await import(senseIndexPath);
|
||||||
|
```
|
||||||
|
|
||||||
|
## Test Files
|
||||||
|
|
||||||
|
Test files (`__tests__/**`) are exempt — dynamic import after `vi.mock()` is standard vitest practice.
|
||||||
@@ -56,9 +56,10 @@ pnpm -r run build
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# Only publish packages that have version bumps
|
# Only publish packages that have version bumps
|
||||||
cd packages/core && npm publish --access public
|
# MUST use pnpm publish (not npm) — pnpm converts workspace:* to real versions
|
||||||
cd packages/daemon && npm publish --access public
|
cd packages/core && pnpm publish --access public --no-git-checks
|
||||||
cd packages/cli && npm publish --access public
|
cd packages/daemon && pnpm publish --access public --no-git-checks
|
||||||
|
cd packages/cli && pnpm publish --access public --no-git-checks
|
||||||
```
|
```
|
||||||
|
|
||||||
### 5. Commit & tag
|
### 5. Commit & tag
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@uncaged/nerve-cli",
|
"name": "@uncaged/nerve-cli",
|
||||||
"version": "0.1.5",
|
"version": "0.1.8",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"bin": {
|
"bin": {
|
||||||
"nerve": "dist/cli.js"
|
"nerve": "dist/cli.js"
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
"access": "public"
|
"access": "public"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"prepublishOnly": "bash ../../scripts/prepublish-check.sh",
|
||||||
"build": "tsup",
|
"build": "tsup",
|
||||||
"test": "vitest run"
|
"test": "vitest run"
|
||||||
},
|
},
|
||||||
@@ -22,9 +23,9 @@
|
|||||||
"citty": "^0.1.6"
|
"citty": "^0.1.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@uncaged/nerve-daemon": "workspace:*",
|
|
||||||
"@types/better-sqlite3": "^7.6.13",
|
"@types/better-sqlite3": "^7.6.13",
|
||||||
"@types/node": "^22.0.0",
|
"@types/node": "^22.0.0",
|
||||||
|
"@uncaged/nerve-daemon": "workspace:*",
|
||||||
"vitest": "^4.1.5"
|
"vitest": "^4.1.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { daemonCommand } from "../commands/daemon.js";
|
||||||
|
import { devCommand } from "../commands/dev.js";
|
||||||
|
import { daemonStartCommand } from "../commands/start.js";
|
||||||
|
|
||||||
|
describe("nerve daemon command group", () => {
|
||||||
|
it("exposes start, stop, status, restart, and logs subcommands", () => {
|
||||||
|
const subs = daemonCommand.subCommands;
|
||||||
|
expect(subs).toBeDefined();
|
||||||
|
if (!subs) {
|
||||||
|
throw new Error("expected daemonCommand.subCommands");
|
||||||
|
}
|
||||||
|
expect(Object.keys(subs).sort()).toEqual(["logs", "restart", "start", "status", "stop"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("shares the same start command object as top-level nerve start alias", () => {
|
||||||
|
const subs = daemonCommand.subCommands;
|
||||||
|
expect(subs?.start).toBe(daemonStartCommand);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("nerve dev", () => {
|
||||||
|
it("is a foreground dev command", () => {
|
||||||
|
expect(devCommand.meta?.name).toBe("dev");
|
||||||
|
expect(devCommand.meta?.description).toMatch(/foreground/i);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,159 @@
|
|||||||
|
/**
|
||||||
|
* Tests for sense SQLite helpers used by `nerve sense schema` / `nerve sense query`.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { mkdirSync, rmSync } from "node:fs";
|
||||||
|
import { tmpdir } from "node:os";
|
||||||
|
import { join } from "node:path";
|
||||||
|
import { DatabaseSync } from "node:sqlite";
|
||||||
|
|
||||||
|
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import {
|
||||||
|
assertSenseDbExists,
|
||||||
|
collectColumnKeys,
|
||||||
|
defaultPreviewSql,
|
||||||
|
formatRowsAsAlignedTable,
|
||||||
|
listTableSqlStatements,
|
||||||
|
parseSenseQueryArgs,
|
||||||
|
pickDefaultPreviewTable,
|
||||||
|
senseDbPath,
|
||||||
|
} from "../sense-sqlite.js";
|
||||||
|
|
||||||
|
let tmpDir: string;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
tmpDir = join(
|
||||||
|
tmpdir(),
|
||||||
|
`nerve-sense-sqlite-${Date.now()}-${Math.random().toString(16).slice(2)}`,
|
||||||
|
);
|
||||||
|
mkdirSync(join(tmpDir, "data", "senses"), { recursive: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
rmSync(tmpDir, { recursive: true, force: true });
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("senseDbPath", () => {
|
||||||
|
it("points at data/senses/<name>.db under the given root", () => {
|
||||||
|
expect(senseDbPath("/root", "cpu-usage")).toBe(join("/root", "data", "senses", "cpu-usage.db"));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("assertSenseDbExists", () => {
|
||||||
|
it("throws when the file is missing", () => {
|
||||||
|
expect(() => assertSenseDbExists(tmpDir, "nope")).toThrow(/No database at/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns the path when the file exists", () => {
|
||||||
|
const p = join(tmpDir, "data", "senses", "x.db");
|
||||||
|
new DatabaseSync(p).close();
|
||||||
|
expect(assertSenseDbExists(tmpDir, "x")).toBe(p);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("listTableSqlStatements", () => {
|
||||||
|
it("returns CREATE statements ordered by tbl_name", () => {
|
||||||
|
const p = join(tmpDir, "data", "senses", "t.db");
|
||||||
|
const db = new DatabaseSync(p);
|
||||||
|
db.exec("CREATE TABLE zebra (id INTEGER)");
|
||||||
|
db.exec("CREATE TABLE alpha (id INTEGER)");
|
||||||
|
const stmts = listTableSqlStatements(db);
|
||||||
|
db.close();
|
||||||
|
expect(stmts).toHaveLength(2);
|
||||||
|
expect(stmts[0]).toMatch(/^CREATE TABLE alpha/i);
|
||||||
|
expect(stmts[1]).toMatch(/^CREATE TABLE zebra/i);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("pickDefaultPreviewTable", () => {
|
||||||
|
it("prefers non-_migrations tables when both exist", () => {
|
||||||
|
const p = join(tmpDir, "data", "senses", "t.db");
|
||||||
|
const db = new DatabaseSync(p);
|
||||||
|
db.exec("CREATE TABLE _migrations (name TEXT PRIMARY KEY)");
|
||||||
|
db.exec("CREATE TABLE readings (id INTEGER)");
|
||||||
|
expect(pickDefaultPreviewTable(db)).toBe("readings");
|
||||||
|
db.close();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses _migrations when it is the only table", () => {
|
||||||
|
const p = join(tmpDir, "data", "senses", "t.db");
|
||||||
|
const db = new DatabaseSync(p);
|
||||||
|
db.exec("CREATE TABLE _migrations (name TEXT PRIMARY KEY)");
|
||||||
|
expect(pickDefaultPreviewTable(db)).toBe("_migrations");
|
||||||
|
db.close();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("defaultPreviewSql", () => {
|
||||||
|
it("quotes identifiers for SQL safety", () => {
|
||||||
|
expect(defaultPreviewSql(`weird"name`)).toContain(`weird""name`);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("parseSenseQueryArgs", () => {
|
||||||
|
it("parses sense name only", () => {
|
||||||
|
expect(parseSenseQueryArgs(["cpu"])).toEqual({ name: "cpu", sql: undefined });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("strips --json", () => {
|
||||||
|
expect(parseSenseQueryArgs(["cpu", "--json"])).toEqual({ name: "cpu", sql: undefined });
|
||||||
|
expect(parseSenseQueryArgs(["--json", "cpu"])).toEqual({ name: "cpu", sql: undefined });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("joins remaining tokens into SQL", () => {
|
||||||
|
expect(parseSenseQueryArgs(["cpu", "SELECT", "1"])).toEqual({ name: "cpu", sql: "SELECT 1" });
|
||||||
|
});
|
||||||
|
|
||||||
|
it("throws when name is missing", () => {
|
||||||
|
expect(() => parseSenseQueryArgs(["--json"])).toThrow(/Missing sense name/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("formatRowsAsAlignedTable", () => {
|
||||||
|
it("shows empty marker for no rows", () => {
|
||||||
|
expect(formatRowsAsAlignedTable([])).toContain("(0 rows)");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("aligns columns from row data", () => {
|
||||||
|
const out = formatRowsAsAlignedTable([
|
||||||
|
{ a: 1, b: "x" },
|
||||||
|
{ a: 22, b: "yy" },
|
||||||
|
]);
|
||||||
|
expect(out).toContain("a");
|
||||||
|
expect(out).toContain("b");
|
||||||
|
expect(out).toContain("22");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("collectColumnKeys", () => {
|
||||||
|
it("preserves key order from first row then appends new keys", () => {
|
||||||
|
expect(
|
||||||
|
collectColumnKeys([
|
||||||
|
{ z: 1, a: 2 },
|
||||||
|
{ a: 3, b: 4 },
|
||||||
|
]),
|
||||||
|
).toEqual(["z", "a", "b"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("readonly query integration", () => {
|
||||||
|
it("runs default preview SQL on a real db", () => {
|
||||||
|
const p = join(tmpDir, "data", "senses", "demo.db");
|
||||||
|
const rw = new DatabaseSync(p);
|
||||||
|
rw.exec("CREATE TABLE items (id INTEGER PRIMARY KEY, v TEXT)");
|
||||||
|
rw.exec("INSERT INTO items (v) VALUES ('a'), ('b')");
|
||||||
|
rw.close();
|
||||||
|
|
||||||
|
const db = new DatabaseSync(p, { readOnly: true });
|
||||||
|
const table = pickDefaultPreviewTable(db);
|
||||||
|
expect(table).toBe("items");
|
||||||
|
if (table === null) {
|
||||||
|
throw new Error("expected items table");
|
||||||
|
}
|
||||||
|
const sql = defaultPreviewSql(table);
|
||||||
|
const rows = db.prepare(sql).all() as Record<string, unknown>[];
|
||||||
|
db.close();
|
||||||
|
expect(rows.length).toBeGreaterThanOrEqual(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
import { defineCommand, runMain } from "citty";
|
import { defineCommand, runMain } from "citty";
|
||||||
|
|
||||||
|
import { daemonCommand } from "./commands/daemon.js";
|
||||||
|
import { devCommand } from "./commands/dev.js";
|
||||||
import { initCommand } from "./commands/init.js";
|
import { initCommand } from "./commands/init.js";
|
||||||
import { logsCommand } from "./commands/logs.js";
|
import { logsCommand } from "./commands/logs.js";
|
||||||
import { senseCommand } from "./commands/sense.js";
|
import { senseCommand } from "./commands/sense.js";
|
||||||
import { startCommand } from "./commands/start.js";
|
import { daemonStartCommand } from "./commands/start.js";
|
||||||
import { statusCommand } from "./commands/status.js";
|
import { statusCommand } from "./commands/status.js";
|
||||||
import { stopCommand } from "./commands/stop.js";
|
import { stopCommand } from "./commands/stop.js";
|
||||||
import { storeCommand } from "./commands/store.js";
|
import { storeCommand } from "./commands/store.js";
|
||||||
@@ -17,7 +19,9 @@ const main = defineCommand({
|
|||||||
},
|
},
|
||||||
subCommands: {
|
subCommands: {
|
||||||
init: initCommand,
|
init: initCommand,
|
||||||
start: startCommand,
|
daemon: daemonCommand,
|
||||||
|
dev: devCommand,
|
||||||
|
start: daemonStartCommand,
|
||||||
stop: stopCommand,
|
stop: stopCommand,
|
||||||
status: statusCommand,
|
status: statusCommand,
|
||||||
logs: logsCommand,
|
logs: logsCommand,
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { defineCommand } from "citty";
|
||||||
|
|
||||||
|
import { logsCommand } from "./logs.js";
|
||||||
|
import { daemonStartCommand, runDaemonStartCommand } from "./start.js";
|
||||||
|
import { statusCommand } from "./status.js";
|
||||||
|
import { runStopCommand, stopCommand } from "./stop.js";
|
||||||
|
|
||||||
|
const daemonRestartCommand = defineCommand({
|
||||||
|
meta: {
|
||||||
|
name: "restart",
|
||||||
|
description: "Stop then start the nerve daemon",
|
||||||
|
},
|
||||||
|
async run() {
|
||||||
|
await runStopCommand();
|
||||||
|
await runDaemonStartCommand();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
export const daemonCommand = defineCommand({
|
||||||
|
meta: {
|
||||||
|
name: "daemon",
|
||||||
|
description: "Manage the nerve background daemon",
|
||||||
|
},
|
||||||
|
subCommands: {
|
||||||
|
start: daemonStartCommand,
|
||||||
|
stop: stopCommand,
|
||||||
|
status: statusCommand,
|
||||||
|
restart: daemonRestartCommand,
|
||||||
|
logs: logsCommand,
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { defineCommand } from "citty";
|
||||||
|
|
||||||
|
import { runForegroundKernelSession } from "../run-foreground-kernel.js";
|
||||||
|
import { loadDaemonModule } from "../workspace-daemon.js";
|
||||||
|
import { getNerveRoot } from "../workspace.js";
|
||||||
|
|
||||||
|
export const devCommand = defineCommand({
|
||||||
|
meta: {
|
||||||
|
name: "dev",
|
||||||
|
description: "Run the nerve kernel in the foreground (development mode)",
|
||||||
|
},
|
||||||
|
async run() {
|
||||||
|
const nerveRoot = getNerveRoot();
|
||||||
|
const { createKernel } = await loadDaemonModule(nerveRoot);
|
||||||
|
await runForegroundKernelSession(nerveRoot, createKernel);
|
||||||
|
},
|
||||||
|
});
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
|
import { spawn, execFile } from "node:child_process";
|
||||||
import { existsSync, mkdirSync, writeFileSync } from "node:fs";
|
import { existsSync, mkdirSync, writeFileSync } from "node:fs";
|
||||||
import { dirname, join } from "node:path";
|
import { dirname, join } from "node:path";
|
||||||
|
import { promisify } from "node:util";
|
||||||
|
|
||||||
import { defineCommand } from "citty";
|
import { defineCommand } from "citty";
|
||||||
|
|
||||||
@@ -42,6 +44,8 @@ const GITIGNORE = `data/
|
|||||||
node_modules/
|
node_modules/
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
const execFileAsync = promisify(execFile);
|
||||||
|
|
||||||
const CPU_SCHEMA_TS = `import { integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
|
const CPU_SCHEMA_TS = `import { integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
|
||||||
|
|
||||||
export const cpuUsage = sqliteTable("cpu_usage", {
|
export const cpuUsage = sqliteTable("cpu_usage", {
|
||||||
@@ -90,7 +94,6 @@ function writeFile(filePath: string, content: string): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function runCommand(cmd: string, args: string[], cwd: string): Promise<void> {
|
async function runCommand(cmd: string, args: string[], cwd: string): Promise<void> {
|
||||||
const { spawn } = await import("node:child_process");
|
|
||||||
await new Promise<void>((resolve, reject) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
const child = spawn(cmd, args, { cwd, stdio: "inherit" });
|
const child = spawn(cmd, args, { cwd, stdio: "inherit" });
|
||||||
child.on("close", (code) => {
|
child.on("close", (code) => {
|
||||||
@@ -102,10 +105,6 @@ async function runCommand(cmd: string, args: string[], cwd: string): Promise<voi
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function detectPackageManager(): Promise<{ cmd: string; installArgs: string[] }> {
|
async function detectPackageManager(): Promise<{ cmd: string; installArgs: string[] }> {
|
||||||
const { execFile } = await import("node:child_process");
|
|
||||||
const { promisify } = await import("node:util");
|
|
||||||
const execFileAsync = promisify(execFile);
|
|
||||||
|
|
||||||
for (const pm of ["pnpm", "yarn", "npm"]) {
|
for (const pm of ["pnpm", "yarn", "npm"]) {
|
||||||
try {
|
try {
|
||||||
await execFileAsync(pm, ["--version"]);
|
await execFileAsync(pm, ["--version"]);
|
||||||
@@ -223,9 +222,6 @@ async function tryRequireSqlite(nerveRoot: string): Promise<boolean> {
|
|||||||
try {
|
try {
|
||||||
const modulePath = join(nerveRoot, "node_modules", "better-sqlite3");
|
const modulePath = join(nerveRoot, "node_modules", "better-sqlite3");
|
||||||
// Use a child process to test if the native module loads
|
// Use a child process to test if the native module loads
|
||||||
const { execFile } = await import("node:child_process");
|
|
||||||
const { promisify } = await import("node:util");
|
|
||||||
const execFileAsync = promisify(execFile);
|
|
||||||
await execFileAsync("node", ["-e", `require(${JSON.stringify(modulePath)})`], {
|
await execFileAsync("node", ["-e", `require(${JSON.stringify(modulePath)})`], {
|
||||||
cwd: nerveRoot,
|
cwd: nerveRoot,
|
||||||
timeout: 10_000,
|
timeout: 10_000,
|
||||||
|
|||||||
@@ -1,10 +1,20 @@
|
|||||||
import { readFileSync } from "node:fs";
|
import { readFileSync } from "node:fs";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
|
import { DatabaseSync } from "node:sqlite";
|
||||||
|
|
||||||
import { type SenseInfo, parseNerveConfig } from "@uncaged/nerve-core";
|
import { type SenseInfo, parseNerveConfig } from "@uncaged/nerve-core";
|
||||||
import { defineCommand } from "citty";
|
import { defineCommand } from "citty";
|
||||||
|
|
||||||
import { listSensesViaDaemon, triggerSenseViaDaemon } from "../daemon-client.js";
|
import { listSensesViaDaemon, triggerSenseViaDaemon } from "../daemon-client.js";
|
||||||
|
import {
|
||||||
|
assertSenseDbExists,
|
||||||
|
defaultPreviewSql,
|
||||||
|
formatRowsAsAlignedTable,
|
||||||
|
listTableSqlStatements,
|
||||||
|
openSenseDb,
|
||||||
|
parseSenseQueryArgs,
|
||||||
|
pickDefaultPreviewTable,
|
||||||
|
} from "../sense-sqlite.js";
|
||||||
import { getNerveRoot, getSocketPath, isRunning } from "../workspace.js";
|
import { getNerveRoot, getSocketPath, isRunning } from "../workspace.js";
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -70,7 +80,6 @@ const senseListCommand = defineCommand({
|
|||||||
},
|
},
|
||||||
async run() {
|
async run() {
|
||||||
if (!isRunning()) {
|
if (!isRunning()) {
|
||||||
// Daemon not running — show static info from nerve.yaml
|
|
||||||
process.stderr.write(
|
process.stderr.write(
|
||||||
"⚠️ Daemon is not running — showing static config only (no last signal time).\n\n",
|
"⚠️ Daemon is not running — showing static config only (no last signal time).\n\n",
|
||||||
);
|
);
|
||||||
@@ -139,6 +148,115 @@ const senseTriggerCommand = defineCommand({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// nerve sense schema <name>
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
const senseSchemaCommand = defineCommand({
|
||||||
|
meta: {
|
||||||
|
name: "schema",
|
||||||
|
description: "Print CREATE TABLE statements from a sense SQLite database",
|
||||||
|
},
|
||||||
|
args: {
|
||||||
|
name: {
|
||||||
|
type: "positional",
|
||||||
|
description: "Sense name (data/senses/<name>.db under the nerve workspace)",
|
||||||
|
},
|
||||||
|
json: {
|
||||||
|
type: "boolean",
|
||||||
|
description: "Print JSON array of CREATE TABLE SQL strings",
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
async run({ args }) {
|
||||||
|
const nerveRoot = getNerveRoot();
|
||||||
|
let db: DatabaseSync | undefined;
|
||||||
|
try {
|
||||||
|
db = openSenseDb(nerveRoot, args.name);
|
||||||
|
const statements = listTableSqlStatements(db);
|
||||||
|
if (args.json) {
|
||||||
|
process.stdout.write(`${JSON.stringify(statements, null, 2)}\n`);
|
||||||
|
} else if (statements.length === 0) {
|
||||||
|
process.stdout.write("(no tables)\n");
|
||||||
|
} else {
|
||||||
|
for (const sql of statements) {
|
||||||
|
process.stdout.write(`${sql};\n\n`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
const msg = e instanceof Error ? e.message : String(e);
|
||||||
|
process.stderr.write(`❌ ${msg}\n`);
|
||||||
|
process.exit(1);
|
||||||
|
} finally {
|
||||||
|
db?.close();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// nerve sense query <name> [sql...]
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
const senseQueryCommand = defineCommand({
|
||||||
|
meta: {
|
||||||
|
name: "query",
|
||||||
|
description:
|
||||||
|
"Run a read-only SQL query against a sense database (default: last 10 rows of the first data table). Pass optional SQL after the sense name; multiple words are joined.",
|
||||||
|
},
|
||||||
|
args: {
|
||||||
|
name: {
|
||||||
|
type: "positional",
|
||||||
|
description: "Sense name (data/senses/<name>.db under the nerve workspace)",
|
||||||
|
},
|
||||||
|
json: {
|
||||||
|
type: "boolean",
|
||||||
|
description: "Print result rows as JSON",
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
async run({ args, rawArgs }) {
|
||||||
|
const nerveRoot = getNerveRoot();
|
||||||
|
let db: DatabaseSync | undefined;
|
||||||
|
try {
|
||||||
|
let parsed: { name: string; sql: string | undefined };
|
||||||
|
try {
|
||||||
|
parsed = parseSenseQueryArgs(rawArgs);
|
||||||
|
} catch (e) {
|
||||||
|
const msg = e instanceof Error ? e.message : String(e);
|
||||||
|
process.stderr.write(`❌ ${msg}\n`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
db = openSenseDb(nerveRoot, args.name);
|
||||||
|
|
||||||
|
let sql = parsed.sql?.trim();
|
||||||
|
if (!sql) {
|
||||||
|
const table = pickDefaultPreviewTable(db);
|
||||||
|
if (table === null) {
|
||||||
|
process.stderr.write("❌ No tables found in database.\n");
|
||||||
|
process.exit(1);
|
||||||
|
} else {
|
||||||
|
sql = defaultPreviewSql(table);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = db.prepare(sql).all() as Record<string, unknown>[];
|
||||||
|
|
||||||
|
if (args.json) {
|
||||||
|
process.stdout.write(`${JSON.stringify(rows, null, 2)}\n`);
|
||||||
|
} else {
|
||||||
|
process.stdout.write(formatRowsAsAlignedTable(rows));
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
const msg = e instanceof Error ? e.message : String(e);
|
||||||
|
process.stderr.write(`❌ ${msg}\n`);
|
||||||
|
process.exit(1);
|
||||||
|
} finally {
|
||||||
|
db?.close();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// nerve sense (parent command)
|
// nerve sense (parent command)
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -151,5 +269,7 @@ export const senseCommand = defineCommand({
|
|||||||
subCommands: {
|
subCommands: {
|
||||||
list: senseListCommand,
|
list: senseListCommand,
|
||||||
trigger: senseTriggerCommand,
|
trigger: senseTriggerCommand,
|
||||||
|
schema: senseSchemaCommand,
|
||||||
|
query: senseQueryCommand,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { spawn } from "node:child_process";
|
||||||
import { createWriteStream, existsSync } from "node:fs";
|
import { createWriteStream, existsSync } from "node:fs";
|
||||||
import { mkdir } from "node:fs/promises";
|
import { mkdir } from "node:fs/promises";
|
||||||
import { dirname, join } from "node:path";
|
import { dirname, join } from "node:path";
|
||||||
@@ -5,11 +6,10 @@ import { fileURLToPath } from "node:url";
|
|||||||
|
|
||||||
import { defineCommand } from "citty";
|
import { defineCommand } from "citty";
|
||||||
|
|
||||||
import { runForegroundKernelSession } from "../run-foreground-kernel.js";
|
|
||||||
import { loadDaemonModule } from "../workspace-daemon.js";
|
|
||||||
import {
|
import {
|
||||||
getLogPath,
|
getLogPath,
|
||||||
getNerveRoot,
|
getNerveRoot,
|
||||||
|
getSocketPath,
|
||||||
isRunning,
|
isRunning,
|
||||||
readPidFile,
|
readPidFile,
|
||||||
removePidFile,
|
removePidFile,
|
||||||
@@ -52,15 +52,10 @@ function daemonBootstrapScript(): string {
|
|||||||
return bootstrapJs;
|
return bootstrapJs;
|
||||||
}
|
}
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`daemon-bootstrap.js not found next to CLI at ${bootstrapJs}. Build the CLI package (e.g. \`pnpm --filter @uncaged/nerve-cli build\`) before using background mode (\`nerve start -d\`).`,
|
`daemon-bootstrap.js not found next to CLI at ${bootstrapJs}. Build the CLI package (e.g. \`pnpm --filter @uncaged/nerve-cli build\`) before using \`nerve daemon start\`.`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function runForeground(nerveRoot: string): Promise<void> {
|
|
||||||
const { createKernel } = await loadDaemonModule(nerveRoot);
|
|
||||||
await runForegroundKernelSession(nerveRoot, createKernel);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function runDaemon(nerveRoot: string): Promise<void> {
|
async function runDaemon(nerveRoot: string): Promise<void> {
|
||||||
if (isRunning()) {
|
if (isRunning()) {
|
||||||
const pid = readPidFile();
|
const pid = readPidFile();
|
||||||
@@ -71,7 +66,6 @@ async function runDaemon(nerveRoot: string): Promise<void> {
|
|||||||
const logPath = getLogPath();
|
const logPath = getLogPath();
|
||||||
await mkdir(join(nerveRoot, "logs"), { recursive: true });
|
await mkdir(join(nerveRoot, "logs"), { recursive: true });
|
||||||
|
|
||||||
const { spawn } = await import("node:child_process");
|
|
||||||
const logStream = createWriteStream(logPath, { flags: "a" });
|
const logStream = createWriteStream(logPath, { flags: "a" });
|
||||||
await new Promise<void>((resolve) => {
|
await new Promise<void>((resolve) => {
|
||||||
if (logStream.pending) logStream.once("open", () => resolve());
|
if (logStream.pending) logStream.once("open", () => resolve());
|
||||||
@@ -97,7 +91,6 @@ async function runDaemon(nerveRoot: string): Promise<void> {
|
|||||||
|
|
||||||
writePidFile(pid);
|
writePidFile(pid);
|
||||||
|
|
||||||
const { getSocketPath } = await import("../workspace.js");
|
|
||||||
const ready = await waitForSocket(getSocketPath(), 5000);
|
const ready = await waitForSocket(getSocketPath(), 5000);
|
||||||
|
|
||||||
if (!ready || !isRunning()) {
|
if (!ready || !isRunning()) {
|
||||||
@@ -110,29 +103,20 @@ async function runDaemon(nerveRoot: string): Promise<void> {
|
|||||||
|
|
||||||
process.stdout.write(`✅ Nerve daemon started (pid ${pid}).\n`);
|
process.stdout.write(`✅ Nerve daemon started (pid ${pid}).\n`);
|
||||||
process.stdout.write(` Logs: ${logPath}\n`);
|
process.stdout.write(` Logs: ${logPath}\n`);
|
||||||
process.stdout.write(" Run `nerve stop` to stop.\n");
|
process.stdout.write(" Run `nerve daemon stop` (or `nerve stop`) to stop.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
export const startCommand = defineCommand({
|
/** Background daemon only — use `nerve dev` for foreground mode. */
|
||||||
|
export async function runDaemonStartCommand(): Promise<void> {
|
||||||
|
await runDaemon(getNerveRoot());
|
||||||
|
}
|
||||||
|
|
||||||
|
export const daemonStartCommand = defineCommand({
|
||||||
meta: {
|
meta: {
|
||||||
name: "start",
|
name: "start",
|
||||||
description: "Start the nerve daemon",
|
description: "Start the nerve daemon in the background",
|
||||||
},
|
},
|
||||||
args: {
|
async run() {
|
||||||
daemon: {
|
await runDaemonStartCommand();
|
||||||
type: "boolean",
|
|
||||||
alias: "d",
|
|
||||||
description: "Run as background daemon",
|
|
||||||
default: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
async run({ args }) {
|
|
||||||
const nerveRoot = getNerveRoot();
|
|
||||||
|
|
||||||
if (args.daemon) {
|
|
||||||
await runDaemon(nerveRoot);
|
|
||||||
} else {
|
|
||||||
await runForeground(nerveRoot);
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -15,44 +15,49 @@ async function waitForExit(pid: number, timeoutMs: number): Promise<boolean> {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Core stop logic — also used by `nerve daemon restart`. */
|
||||||
|
export async function runStopCommand(): Promise<void> {
|
||||||
|
const pid = readPidFile();
|
||||||
|
if (pid === null) {
|
||||||
|
process.stdout.write("⚠️ No PID file found — daemon may not be running.\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isRunning()) {
|
||||||
|
process.stdout.write("⚠️ Daemon is not running (stale PID file). Cleaning up.\n");
|
||||||
|
removePidFile();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
process.stdout.write(`Stopping nerve daemon (pid ${pid})…\n`);
|
||||||
|
try {
|
||||||
|
process.kill(pid, "SIGTERM");
|
||||||
|
} catch (e) {
|
||||||
|
const msg = e instanceof Error ? e.message : String(e);
|
||||||
|
process.stderr.write(`❌ Failed to send SIGTERM: ${msg}\n`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const graceful = await waitForExit(pid, 10_000);
|
||||||
|
if (!graceful) {
|
||||||
|
process.stdout.write("⚠️ Daemon did not exit in 10s — sending SIGKILL.\n");
|
||||||
|
try {
|
||||||
|
process.kill(pid, "SIGKILL");
|
||||||
|
} catch {
|
||||||
|
// already dead
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
removePidFile();
|
||||||
|
process.stdout.write("✅ Daemon stopped.\n");
|
||||||
|
}
|
||||||
|
|
||||||
export const stopCommand = defineCommand({
|
export const stopCommand = defineCommand({
|
||||||
meta: {
|
meta: {
|
||||||
name: "stop",
|
name: "stop",
|
||||||
description: "Stop the nerve daemon",
|
description: "Stop the nerve daemon",
|
||||||
},
|
},
|
||||||
async run() {
|
async run() {
|
||||||
const pid = readPidFile();
|
await runStopCommand();
|
||||||
if (pid === null) {
|
|
||||||
process.stdout.write("⚠️ No PID file found — daemon may not be running.\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isRunning()) {
|
|
||||||
process.stdout.write("⚠️ Daemon is not running (stale PID file). Cleaning up.\n");
|
|
||||||
removePidFile();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
process.stdout.write(`Stopping nerve daemon (pid ${pid})…\n`);
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGTERM");
|
|
||||||
} catch (e) {
|
|
||||||
const msg = e instanceof Error ? e.message : String(e);
|
|
||||||
process.stderr.write(`❌ Failed to send SIGTERM: ${msg}\n`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
const graceful = await waitForExit(pid, 10_000);
|
|
||||||
if (!graceful) {
|
|
||||||
process.stdout.write("⚠️ Daemon did not exit in 10s — sending SIGKILL.\n");
|
|
||||||
try {
|
|
||||||
process.kill(pid, "SIGKILL");
|
|
||||||
} catch {
|
|
||||||
// already dead
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
removePidFile();
|
|
||||||
process.stdout.write("✅ Daemon stopped.\n");
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
#!/usr/bin/env node
|
|
||||||
|
|
||||||
import { runForegroundKernelSession } from "./run-foreground-kernel.js";
|
import { runForegroundKernelSession } from "./run-foreground-kernel.js";
|
||||||
import { loadDaemonModule } from "./workspace-daemon.js";
|
import { loadDaemonModule } from "./workspace-daemon.js";
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,127 @@
|
|||||||
|
import { existsSync } from "node:fs";
|
||||||
|
import { join } from "node:path";
|
||||||
|
import { DatabaseSync } from "node:sqlite";
|
||||||
|
|
||||||
|
/** SQLite path for a sense under the nerve workspace root. */
|
||||||
|
export function senseDbPath(nerveRoot: string, senseName: string): string {
|
||||||
|
return join(nerveRoot, "data", "senses", `${senseName}.db`);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function assertSenseDbExists(nerveRoot: string, senseName: string): string {
|
||||||
|
const path = senseDbPath(nerveRoot, senseName);
|
||||||
|
if (!existsSync(path)) {
|
||||||
|
throw new Error(`No database at ${path}`);
|
||||||
|
}
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Open a sense SQLite database in readonly mode using node:sqlite. */
|
||||||
|
export function openSenseDb(nerveRoot: string, senseName: string): DatabaseSync {
|
||||||
|
const path = assertSenseDbExists(nerveRoot, senseName);
|
||||||
|
return new DatabaseSync(path, { readOnly: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
/** `SELECT sql FROM sqlite_master WHERE type='table'` (non-null sql only). */
|
||||||
|
export function listTableSqlStatements(db: DatabaseSync): string[] {
|
||||||
|
const rows = db
|
||||||
|
.prepare(
|
||||||
|
`SELECT sql FROM sqlite_master WHERE type = 'table' AND sql IS NOT NULL ORDER BY tbl_name`,
|
||||||
|
)
|
||||||
|
.all() as { sql: string }[];
|
||||||
|
return rows.map((r) => r.sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Table used for `nerve sense query <name>` with no SQL.
|
||||||
|
* Prefers real data tables over `_migrations`, then lexicographic by name.
|
||||||
|
*/
|
||||||
|
export function pickDefaultPreviewTable(db: DatabaseSync): string | null {
|
||||||
|
const row = db
|
||||||
|
.prepare(
|
||||||
|
`SELECT name FROM sqlite_master
|
||||||
|
WHERE type = 'table' AND sql IS NOT NULL
|
||||||
|
AND name NOT LIKE 'sqlite\\_%' ESCAPE '\\'
|
||||||
|
ORDER BY
|
||||||
|
CASE WHEN name = '_migrations' THEN 1 ELSE 0 END,
|
||||||
|
name
|
||||||
|
LIMIT 1`,
|
||||||
|
)
|
||||||
|
.get() as { name: string } | undefined;
|
||||||
|
return row?.name ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function defaultPreviewSql(table: string): string {
|
||||||
|
return `SELECT * FROM "${table.replace(/"/g, '""')}" ORDER BY rowid DESC LIMIT 10`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Parse sense name and optional SQL from subcommand raw argv (flags stripped). */
|
||||||
|
export function parseSenseQueryArgs(rawArgs: string[]): { name: string; sql: string | undefined } {
|
||||||
|
const pos: string[] = [];
|
||||||
|
for (let i = 0; i < rawArgs.length; i++) {
|
||||||
|
const a = rawArgs[i];
|
||||||
|
if (a === "--json" || a === "--no-json") continue;
|
||||||
|
if (a.startsWith("-")) {
|
||||||
|
const eq = a.indexOf("=");
|
||||||
|
if (eq === -1 && i + 1 < rawArgs.length && !rawArgs[i + 1].startsWith("-")) {
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
pos.push(a);
|
||||||
|
}
|
||||||
|
if (pos.length < 1) {
|
||||||
|
throw new Error("Missing sense name");
|
||||||
|
}
|
||||||
|
const name = pos[0];
|
||||||
|
const sql = pos.length > 1 ? pos.slice(1).join(" ") : undefined;
|
||||||
|
return { name, sql };
|
||||||
|
}
|
||||||
|
|
||||||
|
function stringifyCell(value: unknown): string {
|
||||||
|
if (value === null || value === undefined) return "";
|
||||||
|
if (typeof value === "bigint") return value.toString();
|
||||||
|
if (typeof value === "number" || typeof value === "boolean") return String(value);
|
||||||
|
if (typeof value === "string") return value;
|
||||||
|
if (Buffer.isBuffer(value)) return value.toString("hex");
|
||||||
|
try {
|
||||||
|
return JSON.stringify(value);
|
||||||
|
} catch {
|
||||||
|
return String(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Collect column keys in stable order (first row keys, then any extras). */
|
||||||
|
export function collectColumnKeys(rows: Record<string, unknown>[]): string[] {
|
||||||
|
const keys: string[] = [];
|
||||||
|
const seen = new Set<string>();
|
||||||
|
for (const row of rows) {
|
||||||
|
for (const k of Object.keys(row)) {
|
||||||
|
if (!seen.has(k)) {
|
||||||
|
seen.add(k);
|
||||||
|
keys.push(k);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return keys;
|
||||||
|
}
|
||||||
|
|
||||||
|
const MAX_CELL = 64;
|
||||||
|
|
||||||
|
function truncate(s: string): string {
|
||||||
|
if (s.length <= MAX_CELL) return s;
|
||||||
|
return `${s.slice(0, MAX_CELL - 1)}…`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Plain aligned table for terminal output. */
|
||||||
|
export function formatRowsAsAlignedTable(rows: Record<string, unknown>[]): string {
|
||||||
|
if (rows.length === 0) {
|
||||||
|
return "(0 rows)\n";
|
||||||
|
}
|
||||||
|
const cols = collectColumnKeys(rows);
|
||||||
|
const cells = rows.map((row) => cols.map((c) => truncate(stringifyCell(row[c]))));
|
||||||
|
const widths = cols.map((c, j) => Math.max(c.length, ...cells.map((r) => r[j].length)));
|
||||||
|
const sep = widths.map((w) => "-".repeat(w)).join("-+-");
|
||||||
|
const header = cols.map((c, j) => c.padEnd(widths[j])).join(" | ");
|
||||||
|
const body = cells.map((r) => r.map((cell, j) => cell.padEnd(widths[j])).join(" | ")).join("\n");
|
||||||
|
return `${header}\n${sep}\n${body}\n`;
|
||||||
|
}
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "@uncaged/nerve-core",
|
"name": "@uncaged/nerve-core",
|
||||||
"version": "0.1.3",
|
"version": "0.1.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"prepublishOnly": "bash ../../scripts/prepublish-check.sh",
|
||||||
"build": "tsup",
|
"build": "tsup",
|
||||||
"test": "vitest run"
|
"test": "vitest run"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@uncaged/nerve-daemon",
|
"name": "@uncaged/nerve-daemon",
|
||||||
"version": "0.1.4",
|
"version": "0.1.5",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"types": "dist/index.d.ts",
|
"types": "dist/index.d.ts",
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
"access": "public"
|
"access": "public"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"prepublishOnly": "bash ../../scripts/prepublish-check.sh",
|
||||||
"build": "tsup",
|
"build": "tsup",
|
||||||
"test": "vitest run"
|
"test": "vitest run"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -33,6 +33,11 @@ import { createReflexScheduler } from "./reflex-scheduler.js";
|
|||||||
import type { ReflexScheduler } from "./reflex-scheduler.js";
|
import type { ReflexScheduler } from "./reflex-scheduler.js";
|
||||||
import { createSignalBus } from "./signal-bus.js";
|
import { createSignalBus } from "./signal-bus.js";
|
||||||
import type { SignalBus } from "./signal-bus.js";
|
import type { SignalBus } from "./signal-bus.js";
|
||||||
|
import {
|
||||||
|
formatCapturedStderrTail,
|
||||||
|
formatChildExitSummary,
|
||||||
|
teeCapturedStderr,
|
||||||
|
} from "./worker-fork-support.js";
|
||||||
import { createWorkflowManager } from "./workflow-manager.js";
|
import { createWorkflowManager } from "./workflow-manager.js";
|
||||||
import type { WorkflowManager } from "./workflow-manager.js";
|
import type { WorkflowManager } from "./workflow-manager.js";
|
||||||
|
|
||||||
@@ -84,10 +89,16 @@ function resolveWorkerScript(): string {
|
|||||||
return join(__dir, "sense-worker.js");
|
return join(__dir, "sense-worker.js");
|
||||||
}
|
}
|
||||||
|
|
||||||
function spawnWorker(nerveRoot: string, group: string, workerScript: string): ChildProcess {
|
function spawnWorker(
|
||||||
|
nerveRoot: string,
|
||||||
|
group: string,
|
||||||
|
workerScript: string,
|
||||||
|
stderrTail: { value: string },
|
||||||
|
): ChildProcess {
|
||||||
const child = fork(workerScript, ["--group", group, "--root", nerveRoot], {
|
const child = fork(workerScript, ["--group", group, "--root", nerveRoot], {
|
||||||
stdio: ["ignore", "inherit", "inherit", "ipc"],
|
stdio: ["ignore", "inherit", "pipe", "ipc"],
|
||||||
});
|
});
|
||||||
|
teeCapturedStderr(child, stderrTail);
|
||||||
// Prevent unhandled EPIPE when writing to a child whose IPC channel closed
|
// Prevent unhandled EPIPE when writing to a child whose IPC channel closed
|
||||||
child.on("error", (err) => {
|
child.on("error", (err) => {
|
||||||
if ((err as NodeJS.ErrnoException).code !== "EPIPE") {
|
if ((err as NodeJS.ErrnoException).code !== "EPIPE") {
|
||||||
@@ -240,7 +251,8 @@ export function createKernel(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function startWorker(group: string): Promise<void> {
|
function startWorker(group: string): Promise<void> {
|
||||||
const child = spawnWorker(nerveRoot, group, workerScript);
|
const stderrTail = { value: "" };
|
||||||
|
const child = spawnWorker(nerveRoot, group, workerScript, stderrTail);
|
||||||
|
|
||||||
let workerReadyResolve: (() => void) | undefined;
|
let workerReadyResolve: (() => void) | undefined;
|
||||||
const workerReady = new Promise<void>((resolve) => {
|
const workerReady = new Promise<void>((resolve) => {
|
||||||
@@ -255,9 +267,10 @@ export function createKernel(
|
|||||||
handleWorkerMessage(raw);
|
handleWorkerMessage(raw);
|
||||||
});
|
});
|
||||||
|
|
||||||
child.on("exit", (code) => {
|
child.on("exit", (code, signal) => {
|
||||||
|
const summary = formatChildExitSummary(code, signal ?? null);
|
||||||
process.stderr.write(
|
process.stderr.write(
|
||||||
`[kernel] worker for group "${group}" exited with code ${code ?? "null"}\n`,
|
`[kernel] worker for group "${group}" exited (${summary})${formatCapturedStderrTail(stderrTail.value)}\n`,
|
||||||
);
|
);
|
||||||
// Resolve ready in case the worker exits before sending ready (prevents hangs)
|
// Resolve ready in case the worker exits before sending ready (prevents hangs)
|
||||||
workerReadyResolve?.();
|
workerReadyResolve?.();
|
||||||
|
|||||||
@@ -173,6 +173,7 @@ export async function loadComputeFn(senseIndexPath: string): Promise<Result<Comp
|
|||||||
let mod: unknown;
|
let mod: unknown;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
// Dynamic import required: user-authored sense module, path resolved at runtime
|
||||||
mod = await import(senseIndexPath);
|
mod = await import(senseIndexPath);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
const msg = e instanceof Error ? e.message : String(e);
|
const msg = e instanceof Error ? e.message : String(e);
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import type { WorkerToParentMessage } from "./ipc.js";
|
|||||||
import { parseParentMessage } from "./ipc.js";
|
import { parseParentMessage } from "./ipc.js";
|
||||||
import { executeCompute, loadComputeFn, openPeerDb, openSenseDb } from "./sense-runtime.js";
|
import { executeCompute, loadComputeFn, openPeerDb, openSenseDb } from "./sense-runtime.js";
|
||||||
import type { DrizzleDB, PeerMap, SenseRuntime } from "./sense-runtime.js";
|
import type { DrizzleDB, PeerMap, SenseRuntime } from "./sense-runtime.js";
|
||||||
|
import { ignoreSessionBroadcastSignals } from "./worker-fork-support.js";
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// IPC helpers
|
// IPC helpers
|
||||||
@@ -336,6 +337,10 @@ if (!parsed) {
|
|||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof process.send === "function") {
|
||||||
|
ignoreSessionBroadcastSignals();
|
||||||
|
}
|
||||||
|
|
||||||
bootstrap(parsed.nerveRoot, parsed.group).catch((e) => {
|
bootstrap(parsed.nerveRoot, parsed.group).catch((e) => {
|
||||||
const msg = e instanceof Error ? e.message : String(e);
|
const msg = e instanceof Error ? e.message : String(e);
|
||||||
process.stderr.write(`[sense-worker] Unhandled bootstrap error: ${msg}\n`);
|
process.stderr.write(`[sense-worker] Unhandled bootstrap error: ${msg}\n`);
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
import type { ChildProcess } from "node:child_process";
|
||||||
|
|
||||||
|
const STDERR_TAIL_MAX_CHARS = 16_384;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Forked workers inherit the parent's process group. In foreground `nerve dev`,
|
||||||
|
* terminal-driven SIGINT/SIGTERM is delivered to the whole group, so workers can exit
|
||||||
|
* on the default handler before the kernel sends `{ type: "shutdown" }` over IPC.
|
||||||
|
* Swallow these in worker processes so the parent coordinates shutdown (issue #55).
|
||||||
|
* Only call when `process.send` is defined (fork IPC); standalone `node …-worker.js` keeps default Ctrl+C behaviour.
|
||||||
|
*/
|
||||||
|
export function ignoreSessionBroadcastSignals(): void {
|
||||||
|
const swallow = (): void => {};
|
||||||
|
process.on("SIGINT", swallow);
|
||||||
|
process.on("SIGTERM", swallow);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function teeCapturedStderr(child: ChildProcess, tail: { value: string }): void {
|
||||||
|
const stream = child.stderr;
|
||||||
|
if (stream === null || stream === undefined) return;
|
||||||
|
stream.setEncoding("utf8");
|
||||||
|
stream.on("data", (chunk: string | Buffer) => {
|
||||||
|
const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
|
||||||
|
process.stderr.write(text);
|
||||||
|
tail.value = (tail.value + text).slice(-STDERR_TAIL_MAX_CHARS);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function formatChildExitSummary(
|
||||||
|
code: number | null,
|
||||||
|
signal: NodeJS.Signals | null,
|
||||||
|
): string {
|
||||||
|
const codeStr = code === null || code === undefined ? "null" : String(code);
|
||||||
|
if (signal) {
|
||||||
|
return `code=${codeStr} signal=${signal}`;
|
||||||
|
}
|
||||||
|
return `code=${codeStr}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function formatCapturedStderrTail(tail: string, maxChars = 800): string {
|
||||||
|
const trimmed = tail.trim();
|
||||||
|
if (trimmed.length === 0) return "";
|
||||||
|
const normalized = trimmed.replace(/\r?\n/g, "\\n");
|
||||||
|
if (normalized.length <= maxChars) {
|
||||||
|
return ` worker_stderr=${normalized}`;
|
||||||
|
}
|
||||||
|
return ` worker_stderr=…${normalized.slice(-maxChars)}`;
|
||||||
|
}
|
||||||
@@ -22,6 +22,11 @@ import type {
|
|||||||
import { parseWorkerMessage } from "./ipc.js";
|
import { parseWorkerMessage } from "./ipc.js";
|
||||||
import type { LogStore } from "./log-store.js";
|
import type { LogStore } from "./log-store.js";
|
||||||
import type { WorkflowRunStatus } from "./log-store.js";
|
import type { WorkflowRunStatus } from "./log-store.js";
|
||||||
|
import {
|
||||||
|
formatCapturedStderrTail,
|
||||||
|
formatChildExitSummary,
|
||||||
|
teeCapturedStderr,
|
||||||
|
} from "./worker-fork-support.js";
|
||||||
|
|
||||||
export type WorkflowManager = {
|
export type WorkflowManager = {
|
||||||
/** Trigger a new workflow thread (called by Reflex scheduler). */
|
/** Trigger a new workflow thread (called by Reflex scheduler). */
|
||||||
@@ -60,6 +65,7 @@ type WorkerEntry = {
|
|||||||
stopping: boolean;
|
stopping: boolean;
|
||||||
/** When set, the worker is draining before a hot-reload respawn. */
|
/** When set, the worker is draining before a hot-reload respawn. */
|
||||||
draining: boolean;
|
draining: boolean;
|
||||||
|
stderrTail: { value: string };
|
||||||
};
|
};
|
||||||
|
|
||||||
// Crash respawn backoff: track crash timestamps per workflow.
|
// Crash respawn backoff: track crash timestamps per workflow.
|
||||||
@@ -85,10 +91,12 @@ function spawnWorkflowWorker(
|
|||||||
nerveRoot: string,
|
nerveRoot: string,
|
||||||
workflowName: string,
|
workflowName: string,
|
||||||
workerScript: string,
|
workerScript: string,
|
||||||
|
stderrTail: { value: string },
|
||||||
): ChildProcess {
|
): ChildProcess {
|
||||||
const child = fork(workerScript, ["--workflow", workflowName, "--root", nerveRoot], {
|
const child = fork(workerScript, ["--workflow", workflowName, "--root", nerveRoot], {
|
||||||
stdio: ["ignore", "inherit", "inherit", "ipc"],
|
stdio: ["ignore", "inherit", "pipe", "ipc"],
|
||||||
});
|
});
|
||||||
|
teeCapturedStderr(child, stderrTail);
|
||||||
// Prevent unhandled EPIPE when writing to a child whose IPC channel closed
|
// Prevent unhandled EPIPE when writing to a child whose IPC channel closed
|
||||||
child.on("error", (err) => {
|
child.on("error", (err) => {
|
||||||
if ((err as NodeJS.ErrnoException).code !== "EPIPE") {
|
if ((err as NodeJS.ErrnoException).code !== "EPIPE") {
|
||||||
@@ -395,7 +403,11 @@ export function createWorkflowManager(
|
|||||||
state.active.clear();
|
state.active.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleWorkerExit(workflowName: string, code: number | null): void {
|
function handleWorkerExit(
|
||||||
|
workflowName: string,
|
||||||
|
code: number | null,
|
||||||
|
signal: NodeJS.Signals | null,
|
||||||
|
): void {
|
||||||
const entry = workers.get(workflowName);
|
const entry = workers.get(workflowName);
|
||||||
if (entry?.draining) {
|
if (entry?.draining) {
|
||||||
workers.delete(workflowName);
|
workers.delete(workflowName);
|
||||||
@@ -416,8 +428,10 @@ export function createWorkflowManager(
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const summary = formatChildExitSummary(code, signal);
|
||||||
|
const stderrExtra = entry !== undefined ? formatCapturedStderrTail(entry.stderrTail.value) : "";
|
||||||
process.stderr.write(
|
process.stderr.write(
|
||||||
`[workflow-manager] worker for "${workflowName}" exited with code ${code ?? "null"}\n`,
|
`[workflow-manager] worker for "${workflowName}" exited (${summary})${stderrExtra}\n`,
|
||||||
);
|
);
|
||||||
handleWorkerCrash(workflowName);
|
handleWorkerCrash(workflowName);
|
||||||
}
|
}
|
||||||
@@ -428,17 +442,24 @@ export function createWorkflowManager(
|
|||||||
return existing;
|
return existing;
|
||||||
}
|
}
|
||||||
|
|
||||||
const child = spawnWorkflowWorker(nerveRoot, workflowName, workerScript);
|
const stderrTail = { value: "" };
|
||||||
|
const child = spawnWorkflowWorker(nerveRoot, workflowName, workerScript, stderrTail);
|
||||||
|
|
||||||
child.on("message", (raw: unknown) => {
|
child.on("message", (raw: unknown) => {
|
||||||
handleWorkerMessage(workflowName, raw);
|
handleWorkerMessage(workflowName, raw);
|
||||||
});
|
});
|
||||||
|
|
||||||
child.on("exit", (code) => {
|
child.on("exit", (code, signal) => {
|
||||||
handleWorkerExit(workflowName, code);
|
handleWorkerExit(workflowName, code, signal ?? null);
|
||||||
});
|
});
|
||||||
|
|
||||||
const entry: WorkerEntry = { workflowName, process: child, stopping: false, draining: false };
|
const entry: WorkerEntry = {
|
||||||
|
workflowName,
|
||||||
|
process: child,
|
||||||
|
stopping: false,
|
||||||
|
draining: false,
|
||||||
|
stderrTail,
|
||||||
|
};
|
||||||
workers.set(workflowName, entry);
|
workers.set(workflowName, entry);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import type {
|
|||||||
|
|
||||||
import type { ThreadCommandEventMessage, ThreadEventType, WorkerToParentMessage } from "./ipc.js";
|
import type { ThreadCommandEventMessage, ThreadEventType, WorkerToParentMessage } from "./ipc.js";
|
||||||
import { parseParentMessage } from "./ipc.js";
|
import { parseParentMessage } from "./ipc.js";
|
||||||
|
import { ignoreSessionBroadcastSignals } from "./worker-fork-support.js";
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// IPC helpers
|
// IPC helpers
|
||||||
@@ -197,6 +198,7 @@ async function loadWorkflowDefinition(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Dynamic import required: user-authored workflow module, path resolved at runtime
|
||||||
const mod = await import(indexPath);
|
const mod = await import(indexPath);
|
||||||
const def: unknown = mod.default ?? mod;
|
const def: unknown = mod.default ?? mod;
|
||||||
|
|
||||||
@@ -334,6 +336,10 @@ if (!parsed) {
|
|||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (typeof process.send === "function") {
|
||||||
|
ignoreSessionBroadcastSignals();
|
||||||
|
}
|
||||||
|
|
||||||
bootstrap(parsed.nerveRoot, parsed.workflow).catch((e) => {
|
bootstrap(parsed.nerveRoot, parsed.workflow).catch((e) => {
|
||||||
const msg = e instanceof Error ? e.message : String(e);
|
const msg = e instanceof Error ? e.message : String(e);
|
||||||
process.stderr.write(`[workflow-worker] Unhandled bootstrap error: ${msg}\n`);
|
process.stderr.write(`[workflow-worker] Unhandled bootstrap error: ${msg}\n`);
|
||||||
|
|||||||
Generated
+9
-2
@@ -60,7 +60,7 @@ importers:
|
|||||||
version: 11.10.0
|
version: 11.10.0
|
||||||
drizzle-orm:
|
drizzle-orm:
|
||||||
specifier: ^0.43.1
|
specifier: ^0.43.1
|
||||||
version: 0.43.1(@types/better-sqlite3@7.6.13)(better-sqlite3@11.10.0)
|
version: 0.43.1(@types/better-sqlite3@7.6.13)(better-sqlite3@11.10.0)(sql.js@1.14.1)
|
||||||
yaml:
|
yaml:
|
||||||
specifier: ^2.8.3
|
specifier: ^2.8.3
|
||||||
version: 2.8.3
|
version: 2.8.3
|
||||||
@@ -1071,6 +1071,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
|
resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
|
||||||
engines: {node: '>= 12'}
|
engines: {node: '>= 12'}
|
||||||
|
|
||||||
|
sql.js@1.14.1:
|
||||||
|
resolution: {integrity: sha512-gcj8zBWU5cFsi9WUP+4bFNXAyF1iRpA3LLyS/DP5xlrNzGmPIizUeBggKa8DbDwdqaKwUcTEnChtd2grWo/x/A==}
|
||||||
|
|
||||||
stackback@0.0.2:
|
stackback@0.0.2:
|
||||||
resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
|
resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
|
||||||
|
|
||||||
@@ -1692,10 +1695,11 @@ snapshots:
|
|||||||
|
|
||||||
detect-libc@2.1.2: {}
|
detect-libc@2.1.2: {}
|
||||||
|
|
||||||
drizzle-orm@0.43.1(@types/better-sqlite3@7.6.13)(better-sqlite3@11.10.0):
|
drizzle-orm@0.43.1(@types/better-sqlite3@7.6.13)(better-sqlite3@11.10.0)(sql.js@1.14.1):
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@types/better-sqlite3': 7.6.13
|
'@types/better-sqlite3': 7.6.13
|
||||||
better-sqlite3: 11.10.0
|
better-sqlite3: 11.10.0
|
||||||
|
sql.js: 1.14.1
|
||||||
|
|
||||||
end-of-stream@1.4.5:
|
end-of-stream@1.4.5:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -1997,6 +2001,9 @@ snapshots:
|
|||||||
|
|
||||||
source-map@0.7.6: {}
|
source-map@0.7.6: {}
|
||||||
|
|
||||||
|
sql.js@1.14.1:
|
||||||
|
optional: true
|
||||||
|
|
||||||
stackback@0.0.2: {}
|
stackback@0.0.2: {}
|
||||||
|
|
||||||
std-env@4.1.0: {}
|
std-env@4.1.0: {}
|
||||||
|
|||||||
Executable
+8
@@ -0,0 +1,8 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# All packages must use pnpm publish. Block npm publish unconditionally.
|
||||||
|
|
||||||
|
if [ -z "$npm_execpath" ] || [[ "$npm_execpath" != *pnpm* ]]; then
|
||||||
|
echo "❌ Use 'pnpm publish' instead of 'npm publish'."
|
||||||
|
echo " pnpm auto-converts workspace:* dependencies to real versions."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user