hostctl 0.1.45 → 0.1.48

package/dist/index.d.ts

@@ -841,9 +841,7 @@ declare class App {
     private resolveTaskFnFromModule;
     parseParams(scriptArgs: string[]): Object;
     pathOfPackageJsonFile(path: string): Path | null;
-    printRuntimeReport(): Promise<void>;
     promptPasswordInteractively(message?: string): Promise<string>;
-    installRuntime(): Promise<void>;
     /**
      * Executes a command on the selected hosts
      *
@@ -892,8 +890,6 @@ declare class Cli {
     deriveConfigRef(suppliedConfigRef?: string): string;
     loadApp(opts: Record<string, any>): Promise<void>;
     run(): Promise<void>;
-    handleRuntime(options: Record<string, any>, cmd: cmdr.Command): Promise<void>;
-    handleRuntimeInstall(options: Record<string, any>, cmd: cmdr.Command): Promise<void>;
     handlePkgCreate(packageName: string, options: {
         lang: 'typescript' | 'javascript';
     }): Promise<void>;
@@ -7154,7 +7150,7 @@ declare class HostctlApi {
 }
 
 type TaskRegistry = {
-    register: (name: string, task: TaskFn) => TaskRegistry;
+    register: <TParams extends TaskParams = TaskParams, TReturn extends RunFnReturnValue = RunFnReturnValue>(name: string, task: TaskFn<TParams, TReturn>) => TaskRegistry;
     get: (name: string) => TaskFn | undefined;
     tasks: () => Array<[string, TaskFn]>;
     has: (name: string) => boolean;

package/dist/index.js

@@ -2718,7 +2718,7 @@ var Verbosity = {
 };
 
 // src/version.ts
-var version = "0.1.45";
+var version = "0.1.48";
 
 // src/commands/pkg/create.ts
 import { promises as fs5 } from "fs";
@@ -2755,8 +2755,7 @@ var packageJsonTsTemplate = (packageName) => `{
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "hostctl": "^0.1.42",
-    "zod": "^4.1.13"
+    "hostctl": "^0.1.42"
   },
   "devDependencies": {
     "typescript": "^5.8.3",
@@ -2789,8 +2788,7 @@ var packageJsonJsTemplate = (packageName) => `{
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "hostctl": "^0.1.42",
-    "zod": "^4.1.13"
+    "hostctl": "^0.1.42"
   },
   "engines": {
     "node": ">=24"
@@ -2825,157 +2823,21 @@ function registryPrefixFromPackageName(packageName) {
   const normalized = withoutPrefix.replace(/[^a-zA-Z0-9]+/g, ".").replace(/^\.|\.$/g, "");
   return normalized || "example";
 }
-var indexTsTemplate = (registryPrefix) => `import { createRegistry } from './registry.js';
+var indexTsTemplate = (registryPrefix) => `import { createRegistry } from 'hostctl';
 import hello from './tasks/hello.js';
 
 export { hello };
 
 export const registry = createRegistry().register('${registryPrefix}.hello', hello);
 `;
-var indexJsTemplate = (registryPrefix) => `import { createRegistry } from './registry.js';
+var indexJsTemplate = (registryPrefix) => `import { createRegistry } from 'hostctl';
 import hello from './tasks/hello.js';
 
 export { hello };
 
 export const registry = createRegistry().register('${registryPrefix}.hello', hello);
 `;
-var registryTsTemplate = `import type { TaskFn } from 'hostctl';
-
-export type TaskRegistry = {
-  register: (name: string, task: TaskFn) => TaskRegistry;
-  get: (name: string) => TaskFn | undefined;
-  tasks: () => Array<[string, TaskFn]>;
-  has: (name: string) => boolean;
-  names: () => string[];
-  size: () => number;
-};
-
-function isTaskFnLike(candidate: unknown): candidate is TaskFn {
-  return (
-    typeof candidate === 'function' &&
-    !!candidate &&
-    'task' in (candidate as Record<string, unknown>) &&
-    typeof (candidate as { task?: unknown }).task === 'object'
-  );
-}
-
-export function createRegistry(): TaskRegistry {
-  const entries = new Map<string, TaskFn>();
-
-  const registry: TaskRegistry = {
-    register(name: string, task: TaskFn) {
-      if (!name || typeof name !== 'string') {
-        throw new Error('Registry task name must be a non-empty string.');
-      }
-      if (!isTaskFnLike(task)) {
-        throw new Error(\`Registry task '\${name}' must be a TaskFn.\`);
-      }
-      if (entries.has(name)) {
-        throw new Error(\`Registry already has a task named '\${name}'.\`);
-      }
-      if (task.task) {
-        task.task.name = name;
-      }
-      entries.set(name, task);
-      return registry;
-    },
-    get(name: string) {
-      return entries.get(name);
-    },
-    tasks() {
-      return Array.from(entries.entries()).sort(([a], [b]) => a.localeCompare(b));
-    },
-    has(name: string) {
-      return entries.has(name);
-    },
-    names() {
-      return Array.from(entries.keys()).sort((a, b) => a.localeCompare(b));
-    },
-    size() {
-      return entries.size;
-    },
-  };
-
-  return registry;
-}
-`;
-var registryJsTemplate = `export function createRegistry() {
-  const entries = new Map();
-
-  const registry = {
-    register(name, task) {
-      if (!name || typeof name !== 'string') {
-        throw new Error('Registry task name must be a non-empty string.');
-      }
-      if (!task || typeof task !== 'function' || !task.task) {
-        throw new Error(\`Registry task '\${name}' must be a TaskFn.\`);
-      }
-      if (entries.has(name)) {
-        throw new Error(\`Registry already has a task named '\${name}'.\`);
-      }
-      if (task.task) {
-        task.task.name = name;
-      }
-      entries.set(name, task);
-      return registry;
-    },
-    get(name) {
-      return entries.get(name);
-    },
-    tasks() {
-      return Array.from(entries.entries()).sort(([a], [b]) => a.localeCompare(b));
-    },
-    has(name) {
-      return entries.has(name);
-    },
-    names() {
-      return Array.from(entries.keys()).sort((a, b) => a.localeCompare(b));
-    },
-    size() {
-      return entries.size;
-    },
-  };
-
-  return registry;
-}
-`;
-var taskWrapperTsTemplate = `import { task as baseTask, type RunFn, type RunFnReturnValue, type TaskFn, type TaskOptions, type TaskParams } from 'hostctl';
-import type { ZodTypeAny } from 'zod';
-
-export type TaskOptionsWithSchema = TaskOptions & {
-  inputSchema?: ZodTypeAny;
-  outputSchema?: ZodTypeAny;
-};
-
-export function task<TParams extends TaskParams, TReturn extends RunFnReturnValue>(
-  runFn: RunFn<TParams, TReturn>,
-  options?: TaskOptionsWithSchema,
-): TaskFn<TParams, TReturn> {
-  const taskFn = baseTask(runFn, options as TaskOptions);
-  if (options?.inputSchema) {
-    (taskFn.task as any).inputSchema = options.inputSchema;
-  }
-  if (options?.outputSchema) {
-    (taskFn.task as any).outputSchema = options.outputSchema;
-  }
-  return taskFn;
-}
-`;
-var taskWrapperJsTemplate = `import { task as baseTask } from 'hostctl';
-
-export function task(runFn, options) {
-  const taskFn = baseTask(runFn, options);
-  if (options?.inputSchema) {
-    taskFn.task.inputSchema = options.inputSchema;
-  }
-  if (options?.outputSchema) {
-    taskFn.task.outputSchema = options.outputSchema;
-  }
-  return taskFn;
-}
-`;
-var sampleTaskTsTemplate = `import { task, type TaskContext } from '../task.js';
-import { z } from 'zod';
+var sampleTaskTsTemplate = `import { task, type TaskContext, z } from 'hostctl';
 
 const HelloInputSchema = z.object({
   name: z.string().optional(),
@@ -3008,8 +2870,7 @@ export default task(run, {
   outputSchema: HelloOutputSchema,
 });
 `;
-var sampleTaskJsTemplate = `import { task } from '../task.js';
-import { z } from 'zod';
+var sampleTaskJsTemplate = `import { task, z } from 'hostctl';
 
 const HelloInputSchema = z.object({
   name: z.string().optional(),
@@ -3055,7 +2916,7 @@ hostctl run . ${registryPrefix}.hello name:Hostctl excited:true
 - Tasks live under \`src/\` and export a default \`task(...)\`.
 - \`src/index.(ts|js)\` re-exports tasks and publishes a registry for discovery.
 - Task names are unqualified; the registry assigns qualified names.
-- Schema helpers come from \`zod\` and are attached to tasks for discovery.
+- Schema helpers come from \`hostctl\` (re-exported \`zod\`) and are attached to tasks for discovery.
 
 ## Publish
 
@@ -3093,8 +2954,6 @@ async function createPackage(packageName, options) {
     await fs5.writeFile(path3.join(packageDir, "tsconfig.json"), tsconfigTemplate);
     await fs5.mkdir(path3.join(packageDir, "src", "tasks"), { recursive: true });
     await fs5.writeFile(path3.join(packageDir, "src", "index.ts"), indexTsTemplate(registryPrefix));
-    await fs5.writeFile(path3.join(packageDir, "src", "registry.ts"), registryTsTemplate);
-    await fs5.writeFile(path3.join(packageDir, "src", "task.ts"), taskWrapperTsTemplate);
     await fs5.writeFile(path3.join(packageDir, "src", "tasks", "hello.ts"), sampleTaskTsTemplate);
     await fs5.writeFile(path3.join(packageDir, "README.md"), readmeTemplate(packageJsonName, registryPrefix, true));
     await fs5.writeFile(path3.join(packageDir, ".gitignore"), gitignoreTemplate);
@@ -3102,8 +2961,6 @@ async function createPackage(packageName, options) {
     await fs5.writeFile(path3.join(packageDir, "package.json"), packageJsonJsTemplate(packageJsonName));
     await fs5.mkdir(path3.join(packageDir, "src", "tasks"), { recursive: true });
     await fs5.writeFile(path3.join(packageDir, "src", "index.js"), indexJsTemplate(registryPrefix));
-    await fs5.writeFile(path3.join(packageDir, "src", "registry.js"), registryJsTemplate);
-    await fs5.writeFile(path3.join(packageDir, "src", "task.js"), taskWrapperJsTemplate);
     await fs5.writeFile(path3.join(packageDir, "src", "tasks", "hello.js"), sampleTaskJsTemplate);
     await fs5.writeFile(path3.join(packageDir, "README.md"), readmeTemplate(packageJsonName, registryPrefix, false));
     await fs5.writeFile(path3.join(packageDir, ".gitignore"), gitignoreTemplate);
@@ -3944,15 +3801,24 @@ var PackageManager = class {
   }
   async ensurePackagesDirHasPackageJson(packagesDir) {
     const packageJsonPath = packagesDir.join("package.json");
-    if (!await packageJsonPath.exists()) {
-      const packageJson = {
+    const hostctlOverride = process.env.HOSTCTL_PKG_HOSTCTL_OVERRIDE;
+    const overrideValue = hostctlOverride ? hostctlOverride.startsWith("file:") ? hostctlOverride : `file:${Path.new(hostctlOverride).absolute().toString()}` : void 0;
+    let packageJson;
+    if (await packageJsonPath.exists()) {
+      const raw = await fs6.readFile(packageJsonPath.toString(), "utf-8");
+      packageJson = JSON.parse(raw);
+    } else {
+      packageJson = {
         name: "hostctl-packages",
         version: "1.0.0",
         description: "Hostctl package management directory",
         private: true
       };
-      await fs6.writeFile(packageJsonPath.toString(), JSON.stringify(packageJson, null, 2));
     }
+    if (overrideValue) {
+      packageJson.overrides = { ...packageJson.overrides ?? {}, hostctl: overrideValue };
+    }
+    await fs6.writeFile(packageJsonPath.toString(), JSON.stringify(packageJson, null, 2));
   }
   // Scan node_modules for the real installed package (by name or repo match)
   async findRealInstalledNpmPackagePath(packagesDir, source) {
@@ -4764,8 +4630,6 @@ var Cli = class {
       '-p, --params "<json object>"',
       "runtime parameters supplied as a string to be parsed as a json object representing params to supply to the script"
     ).option("-r, --remote", "run the script on remote hosts specified by tags via SSH orchestration").action(this.handleRun.bind(this));
-    const runtimeCmd = this.program.command("runtime").alias("rt").description("print out a report of the runtime environment").action(this.handleRuntime.bind(this));
-    runtimeCmd.command("install").alias("i").description("install a temporary runtime environment on the local host if needed").action(this.handleRuntimeInstall.bind(this));
     this.program.command("tasks").description("list tasks available in a package or path").argument("[package-or-path...]", "npm package spec, installed package name, or local path").option("--task <name>", "filter to a specific task name").option("--json", "output should be json formatted").action(this.handleTasksList.bind(this));
   }
   async handleInventory(options, cmd) {
@@ -4945,16 +4809,6 @@ var Cli = class {
       logError("hostctl error:", e);
     }
   }
-  async handleRuntime(options, cmd) {
-    const opts = cmd.optsWithGlobals();
-    await this.loadApp(opts);
-    await this.app.printRuntimeReport();
-  }
-  async handleRuntimeInstall(options, cmd) {
-    const opts = cmd.optsWithGlobals();
-    await this.loadApp(opts);
-    await this.app.installRuntime();
-  }
   async handlePkgCreate(packageName, options) {
     await createPackage(packageName, options);
   }
@@ -7216,15 +7070,6 @@ ${successfullyUsedIdentityPaths}`);
       p = p.parent();
     }
   }
-  async printRuntimeReport() {
-    const nodeRuntime = new NodeRuntime(this.tmpDir);
-    const reportObj = {
-      nodePath: await nodeRuntime.nodePath(),
-      npmPath: await nodeRuntime.npmPath()
-      // summary: report?.getReport(),
-    };
-    this.info(reportObj);
-  }
   async promptPasswordInteractively(message = "Enter your password") {
     if (this.providedPassword !== void 0) {
       return this.providedPassword;
@@ -7243,11 +7088,6 @@ ${successfullyUsedIdentityPaths}`);
     this.providedPassword = await promptPassword({ message });
     return this.providedPassword;
   }
-  async installRuntime() {
-    this.info(`creating node runtime with ${this.tmpDir.toString()}`);
-    const nodeRuntime = new NodeRuntime(this.tmpDir);
-    await nodeRuntime.installIfNeeded();
-  }
   /**
    * Executes a command on the selected hosts
    *
@@ -7437,23 +7277,24 @@ function isTaskFnLike2(candidate) {
 }
 function createRegistry() {
   const entries = /* @__PURE__ */ new Map();
+  function register(name, task6) {
+    if (!name || typeof name !== "string") {
+      throw new Error("Registry task name must be a non-empty string.");
+    }
+    if (!isTaskFnLike2(task6)) {
+      throw new Error(`Registry task '${name}' must be a TaskFn.`);
+    }
+    if (entries.has(name)) {
+      throw new Error(`Registry already has a task named '${name}'.`);
+    }
+    if (task6.task) {
+      task6.task.name = name;
+    }
+    entries.set(name, task6);
+    return registry2;
+  }
   const registry2 = {
-    register(name, task6) {
-      if (!name || typeof name !== "string") {
-        throw new Error("Registry task name must be a non-empty string.");
-      }
-      if (!isTaskFnLike2(task6)) {
-        throw new Error(`Registry task '${name}' must be a TaskFn.`);
-      }
-      if (entries.has(name)) {
-        throw new Error(`Registry already has a task named '${name}'.`);
-      }
-      if (task6.task) {
-        task6.task.name = name;
-      }
-      entries.set(name, task6);
-      return registry2;
-    },
+    register,
     get(name) {
       return entries.get(name);
     },
@@ -33599,22 +33440,25 @@ function resolvedTaskName(task6) {
   }
   return deriveCoreTaskName(task6) ?? taskName ?? null;
 }
-function collectTasksFrom(source, tasks, seen) {
+function collectTasksFrom(source, tasks, seen, pathParts = []) {
   if (!source) return;
   if (isTaskFnLike3(source)) {
     if (!seen.has(source)) {
+      if (!hasExplicitName(source) && pathParts.length > 0) {
+        source.task.name = `core.${pathParts.join(".")}`;
+      }
       tasks.push(source);
       seen.add(source);
     }
     return;
   }
   if (Array.isArray(source)) {
-    source.forEach((entry) => collectTasksFrom(entry, tasks, seen));
+    source.forEach((entry) => collectTasksFrom(entry, tasks, seen, pathParts));
     return;
   }
   if (isTraversableObject(source)) {
-    for (const value of Object.values(source)) {
-      collectTasksFrom(value, tasks, seen);
+    for (const [key, value] of Object.entries(source)) {
+      collectTasksFrom(value, tasks, seen, [...pathParts, key]);
     }
   }
 }