@nodetool-ai/cli 0.8.2 → 0.8.4-a24.1

package/dist/nodetool-main.js

@@ -16,16 +16,16 @@ import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { dirname, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
-import { createInterface } from "node:readline";
-import { workflowToDsl } from "@nodetool-ai/dsl";
+import { workflowToDsl, workflowToScript } from "@nodetool-ai/dsl";
 import { initDb, migrateSqliteDb, Workflow, Asset, Secret, getSecret } from "@nodetool-ai/models";
 import { readCachedHfModels, searchCachedHfModels } from "@nodetool-ai/huggingface";
 import { initMasterKey } from "@nodetool-ai/security";
 import { installLocalModelInterfaces } from "./local-model-interfaces.js";
 import { getDefaultDbPath, getDefaultAssetsPath } from "@nodetool-ai/config";
-import { ExecutionSession, isExecutionPreflightError } from "@nodetool-ai/execution";
+import { ExecutionSession } from "@nodetool-ai/execution";
 import { NodeRegistry, createGraphNodeTypeResolver } from "@nodetool-ai/node-sdk";
-import { registerBuiltinPacks } from "@nodetool-ai/base-nodes/builtin-packs";
+import { registerCliPacks } from "./packs/host.js";
+import { refusePackInstallsInProcess } from "./packs/install-process.js";
 import { CLI_LOCAL_BUILTIN_PACK_POLICY, CLI_DSL_BUILTIN_PACK_POLICY } from "./node-registry.js";
 import { ProcessingContext, createLocalWorkspace, initTelemetry, onPythonBridgeCreated } from "@nodetool-ai/runtime";
 import { FileStorageAdapter } from "@nodetool-ai/storage";
@@ -33,6 +33,8 @@ import { mkdirSync } from "node:fs";
 import { addSupervisorOptions, createSupervisorHandle, parseSupervisorFlags, printSupervisedSummary, recordSupervisorCost, streamInterventionLines } from "./supervisor.js";
 import { registerPackageCommands } from "./commands/package.js";
 import { registerPackCommands } from "./commands/packs.js";
+import { installMissingPacksAndReexec } from "./commands/install-missing-packs.js";
+import { registerRuntimeCommands } from "./commands/runtime.js";
 import { registerDeployCommands } from "./commands/deploy.js";
 import { registerHfCommands } from "./commands/models-hf.js";
 import { registerWorkerCommands } from "./commands/worker.js";
@@ -61,6 +63,7 @@ import { registerCostsCommands } from "./commands/costs.js";
 import { registerErrorsCommands } from "./commands/errors.js";
 import { registerGenerationsCommands } from "./commands/generations.js";
 import { registerRunsCommands } from "./commands/runs.js";
+import { registerProjectCommands } from "./commands/projects.js";
 import { registerGameCommands } from "./commands/game.js";
 import { registerAuthCommands } from "./commands/auth.js";
 import { registerTelegramCommands } from "./commands/telegram.js";
@@ -68,8 +71,9 @@ import { registerResourceReadCommands } from "./commands/resource-read.js";
 import { createApiClient } from "./api-client.js";
 import { listAllModels, listConfiguredProviderInfo, listOllamaModels, listProviderModels } from "./providers.js";
 import { isString } from "./predicates.js";
-import { printTable, asJson } from "./commands/output.js";
-import { printCommandError } from "./command-errors.js";
+import { printTable, asJson, readSecretValue } from "./commands/output.js";
+import { printCommandError, commandMissingRuntime, commandMissingPack } from "./command-errors.js";
+import { childExitCode } from "./child-exit.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 /**
@@ -93,7 +97,9 @@ function ensureDb() {
     initDb(getDefaultDbPath());
 }
 async function setupDb() {
-    ensureDb();
+    const dbPath = getDefaultDbPath();
+    await migrateSqliteDb(dbPath);
+    initDb(dbPath);
     // Resolve the master encryption key from keychain / env / AWS so that
     // both encryption (Secret.upsert) and decryption (Secret.getDecryptedValue)
     // use the same persistent key. Without this, a fresh process would
@@ -211,14 +217,6 @@ async function makeLocalAssetFetcher() {
 // other. The interfaces touch the database only when a node calls them, so
 // installing them before `setupDb()` is safe.
 await installLocalModelInterfaces();
-/**
- * What to print when a run command fails. A preflight refusal already reads as
- * a complete explanation — printing the error class in front of it only buries
- * the secret name the user has to go set.
- */
-function describeRunFailure(error) {
-    return isExecutionPreflightError(error) ? error.message : String(error);
-}
 // ---------------------------------------------------------------------------
 // info
 // ---------------------------------------------------------------------------
@@ -267,12 +265,13 @@ function parseTraceStdout(v) {
 addSupervisorOptions(program
     .command("run <dsl-file>")
     .description("Run a TypeScript/JavaScript DSL workflow file")
-    .option("--json", "Output results as JSON (default: pretty-print)")).action(async (dslFile, opts) => {
+    .option("--json", "Output results as JSON (default: pretty-print)")
+    .option("--install-missing", "Authorize missing node pack installation, then re-execute once")).action(async (dslFile, opts) => {
     try {
         const { resolve } = await import("node:path");
         const { runDslFile } = await import("./run-dsl.js");
         const { NodeRegistry } = await import("@nodetool-ai/node-sdk");
-        registerBuiltinPacks(NodeRegistry.global, CLI_DSL_BUILTIN_PACK_POLICY);
+        await registerCliPacks(NodeRegistry.global, CLI_DSL_BUILTIN_PACK_POLICY);
         const supervisorConfig = parseSupervisorFlags(opts);
         const absolutePath = resolve(dslFile);
         let results;
@@ -305,8 +304,11 @@ addSupervisorOptions(program
         }
     }
     catch (e) {
-        console.error(describeRunFailure(e));
-        process.exit(1);
+        const exit = await installMissingPacksAndReexec(e, { command: "run", installMissing: opts.installMissing });
+        if (exit !== null) {
+            process.exit(exit);
+        }
+        process.exit(printCommandError(e, opts.json));
     }
 });
 program
@@ -364,14 +366,17 @@ program
     .option("--host <host>", "Host to bind", "127.0.0.1")
     .option("--port <port>", "Port to listen on", "7777")
     .action((opts) => {
-    const serverPath = resolve(__dirname, "../../websocket/dist/server.js");
+    refusePackInstallsInProcess("serve");
+    const serverPath = resolve(__dirname, "../dist/packs/serve.js");
     process.env["HOST"] = opts.host;
     process.env["PORT"] = opts.port;
-    const result = spawnSync("node", [serverPath], {
+    const result = spawnSync(process.execPath, [serverPath], {
         stdio: "inherit",
         env: { ...process.env }
     });
-    process.exit(result.status ?? 0);
+    if (result.error)
+        console.error(`Could not start the server: ${result.error.message}`);
+    process.exit(childExitCode(result));
 });
 // ---------------------------------------------------------------------------
 // chat
@@ -398,7 +403,7 @@ program
         stdio: "inherit",
         env: { ...process.env }
     });
-    process.exit(result.status ?? 1);
+    process.exit(childExitCode(result));
 });
 // ---------------------------------------------------------------------------
 // workflows
@@ -411,6 +416,7 @@ addSupervisorOptions(workflows
     .description("Run a workflow by ID, JSON file, or TypeScript DSL file")
     .option("--params <json>", "JSON params string")
     .option("--json", "Output as JSON")
+    .option("--install-missing", "Authorize missing node pack installation, then re-execute once")
     .option("--asset-output-mode <mode>", "How media outputs are materialized: native | raw | data_uri | workspace | storage_url | temp_url", "native")
     .option("--workspace <dir>", "Workspace directory for workspace-mode asset output (default: ./nodetool-output)")
     .option("--trigger-event <json>", 'Wake a trigger node as the scheduler/webhook adapter would: \'{"node_id":"watch","payload":{"path":"/tmp/a.csv","event":"created"}}\'. ' +
@@ -453,14 +459,8 @@ addSupervisorOptions(workflows
             /** A DSL/JSON workflow file: the graph, optionally wrapped. */
             let raw;
             if (idOrFile.endsWith(".ts") || idOrFile.endsWith(".tsx")) {
-                // Execute DSL file via tsx and capture JSON output
-                const { execFileSync } = await import("node:child_process");
-                const output = execFileSync("npx", ["tsx", resolve(idOrFile)], {
-                    encoding: "utf8",
-                    cwd: dirname(resolve(idOrFile)),
-                    timeout: 30000
-                });
-                raw = JSON.parse(output.trim());
+                const { readFileTarget } = await import("./debug/target.js");
+                raw = (await readFileTarget(idOrFile)).raw;
             }
             else {
                 const { readFileSync } = await import("node:fs");
@@ -486,7 +486,7 @@ addSupervisorOptions(workflows
         // the graph through `normalizeGraph` (@nodetool-ai/execution) — no
         // need to duplicate that here.
         const registry = new NodeRegistry();
-        registerBuiltinPacks(registry, CLI_LOCAL_BUILTIN_PACK_POLICY);
+        await registerCliPacks(registry, CLI_LOCAL_BUILTIN_PACK_POLICY);
         const jobId = `job-${Date.now()}`;
         // Resolve asset URIs (e.g. /api/storage/<key>) against the local
         // assets directory, so workflows referencing stored assets run the
@@ -582,6 +582,13 @@ addSupervisorOptions(workflows
             ? streamInterventionLines(session.messages)
             : Promise.resolve();
         const result = await session.result;
+        if (result.status === "failed" && (commandMissingRuntime(result) || commandMissingPack(result))) {
+            const exit = await installMissingPacksAndReexec(result, { command: "workflows-run", installMissing: opts.installMissing });
+            if (exit !== null) {
+                process.exit(exit);
+            }
+            process.exit(printCommandError(result, opts.json));
+        }
         await interventionLines;
         supervisor?.handle.close();
         const interventions = result.interventions ?? [];
@@ -618,8 +625,58 @@ addSupervisorOptions(workflows
         process.exit(result.status === "completed" ? 0 : 1);
     }
     catch (e) {
-        console.error(describeRunFailure(e));
-        process.exit(1);
+        const exit = await installMissingPacksAndReexec(e, { command: "workflows-run", installMissing: opts.installMissing });
+        if (exit !== null) {
+            process.exit(exit);
+        }
+        process.exit(printCommandError(e, opts.json));
+    }
+});
+workflows
+    .command("export-script <workflow_id_or_file>")
+    .description("Convert a workflow into a JavaScript script that calls each node in order (local DB by id, or a JSON file)")
+    .option("-t, --target <target>", "sandbox (a JS script document or Code node body) or node (a standalone Node.js .mjs)", "sandbox")
+    .option("-o, --output <file>", "Write the script to a file")
+    .action(async (idOrFile, opts) => {
+    try {
+        if (opts.target !== "sandbox" && opts.target !== "node") {
+            throw new Error(`Unknown target "${opts.target}": use "sandbox" or "node"`);
+        }
+        let graph;
+        let name;
+        if (idOrFile.endsWith(".json") ||
+            idOrFile.includes("/") ||
+            idOrFile.includes("\\")) {
+            const { readFileSync } = await import("node:fs");
+            const raw = JSON.parse(readFileSync(idOrFile, "utf8"));
+            graph = (raw.graph ?? raw);
+            name = isString(raw.name) ? raw.name : null;
+        }
+        else {
+            ensureDb();
+            const wf = await Workflow.find(LOCAL_USER_ID, idOrFile);
+            if (!wf)
+                throw new Error(`Workflow not found: ${idOrFile}`);
+            graph = wf.getGraph();
+            name = isString(wf.name) ? wf.name : null;
+        }
+        const script = workflowToScript(graph, {
+            target: opts.target,
+            workflowName: name
+        });
+        for (const issue of script.unsupported) {
+            console.error(`warning: ${issue.node_type} (${issue.node_id}) ${issue.message}`);
+        }
+        if (opts.output) {
+            const { writeFile } = await import("node:fs/promises");
+            await writeFile(opts.output, script.code, "utf8");
+            console.log(opts.output);
+            return;
+        }
+        console.log(script.code);
+    }
+    catch (e) {
+        process.exit(printCommandError(e));
     }
 });
 workflows
@@ -662,8 +719,7 @@ workflows
         console.log(source);
     }
     catch (e) {
-        printCommandError(e);
-        process.exit(1);
+        process.exit(printCommandError(e));
     }
 });
 workflows
@@ -774,8 +830,7 @@ workflows
         console.log(outPath);
     }
     catch (e) {
-        printCommandError(e);
-        process.exit(1);
+        process.exit(printCommandError(e));
     }
 });
 workflows
@@ -856,8 +911,7 @@ workflows
         console.log(outPath);
     }
     catch (e) {
-        printCommandError(e);
-        process.exit(1);
+        process.exit(printCommandError(e));
     }
 });
 workflows
@@ -912,8 +966,7 @@ workflows
         }
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 // ---------------------------------------------------------------------------
@@ -963,8 +1016,7 @@ models
         printTable(rows.map(modelRow));
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 models
@@ -985,8 +1037,7 @@ models
         })));
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 registerRecommendedCommand(models);
@@ -1014,8 +1065,7 @@ models
         printTable(rows.map(modelRow));
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 models
@@ -1061,8 +1111,7 @@ models
         printTable(rows.map(modelRow));
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 models
@@ -1086,8 +1135,7 @@ models
         printTable(rows.map(modelRow));
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 // ---------------------------------------------------------------------------
@@ -1123,8 +1171,7 @@ storage
             process.exit(1);
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 workflows
@@ -1154,8 +1201,7 @@ workflows
             process.exit(1);
     }
     catch (e) {
-        printCommandError(e, opts.json);
-        process.exit(1);
+        process.exit(printCommandError(e, opts.json));
     }
 });
 // ---------------------------------------------------------------------------
@@ -1179,8 +1225,7 @@ secrets
         printTable(items.map((s) => ({ key: s.key, updated_at: s.updated_at ?? "" })));
     }
     catch (e) {
-        printCommandError(e);
-        process.exit(1);
+        process.exit(printCommandError(e));
     }
 });
 secrets
@@ -1190,18 +1235,11 @@ secrets
     .option("--description <desc>", "Optional description")
     .action(async (key, opts) => {
     await setupDb();
-    const rl = createInterface({
-        input: process.stdin,
-        output: process.stderr
-    });
-    const value = await new Promise((resolve) => {
-        process.stderr.write(`Enter value for '${key}': `);
-        rl.question("", (ans) => {
-            rl.close();
-            resolve(ans);
-        });
-    });
     try {
+        // Hidden on a TTY: an echoed value stays in the terminal scrollback.
+        const value = await readSecretValue(`Enter value for '${key}': `);
+        if (!value)
+            throw new Error(`No value given for '${key}'; nothing stored.`);
         await Secret.upsert({
             userId: opts.userId,
             key,
@@ -1211,8 +1249,7 @@ secrets
         console.log(`Secret '${key}' stored.`);
     }
     catch (e) {
-        printCommandError(e);
-        process.exit(1);
+        process.exit(printCommandError(e));
     }
 });
 secrets
@@ -1230,8 +1267,7 @@ secrets
         console.log(value);
     }
     catch (e) {
-        printCommandError(e);
-        process.exit(1);
+        process.exit(printCommandError(e));
     }
 });
 // ---------------------------------------------------------------------------
@@ -1292,6 +1328,7 @@ mcp
     "MCP protocol channel.")
     .action(async () => {
     try {
+        refusePackInstallsInProcess("mcp serve");
         const { createMcpServer, createMcpStdioTransport, forwardMcpStdioToLocalServer } = await import("@nodetool-ai/websocket");
         if (await forwardMcpStdioToLocalServer()) {
             process.stderr.write("NodeTool MCP forwarding to the local API server.\n");
@@ -1301,7 +1338,7 @@ mcp
         // A local TS-node registry powers list_nodes / search_nodes /
         // validate_workflow without spinning up a Python worker.
         const registry = new NodeRegistry();
-        registerBuiltinPacks(registry, CLI_LOCAL_BUILTIN_PACK_POLICY);
+        await registerCliPacks(registry, CLI_LOCAL_BUILTIN_PACK_POLICY);
         // stdio serves exactly one local user; "1" is the local single-user id.
         const server = createMcpServer({
             registry,
@@ -1314,15 +1351,16 @@ mcp
         // closes the connection.
     }
     catch (e) {
-        printCommandError(e);
-        process.exit(1);
+        process.exit(printCommandError(e));
     }
 });
 // ---------------------------------------------------------------------------
 // package
 // ---------------------------------------------------------------------------
+registerProjectCommands(program);
 registerPackageCommands(program);
 registerPackCommands(program);
+registerRuntimeCommands(program);
 registerWorkerCommands(program);
 // Any command that opens a remote Python bridge keeps the attached worker's
 // idle clock fresh, so the reaper doesn't pause a GPU that is mid-job.