hostctl 0.1.44 → 0.1.47

package/README.md

@@ -93,12 +93,14 @@ npx hostctl run core.echo message:hello
   ```
   Local directories are executed directly and are not installable via `hostctl pkg install`.
 - **Remote orchestration**
+
   ```bash
   hostctl run -r -t ubuntu core.net.interfaces --json
   ```
 
   - `-r/--remote` targets hosts selected by tags via SSH.
   - `-t/--tag` is greedy; use `--` before positional args when needed.
+
 - **From npm or git**
   ```bash
   hostctl run hostctl-hello greet name:Phil

package/dist/bin/hostctl.js

@@ -4211,7 +4211,7 @@ var ParamMap = class _ParamMap {
 import * as z from "zod";
 
 // src/version.ts
-var version = "0.1.44";
+var version = "0.1.47";
 
 // src/app.ts
 import { retryUntilDefined } from "ts-retry";
@@ -4628,15 +4628,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) {
@@ -6122,8 +6131,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",
@@ -6156,8 +6164,7 @@ var packageJsonJsTemplate = (packageName) => `{
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "hostctl": "^0.1.42",
-    "zod": "^4.1.13"
+    "hostctl": "^0.1.42"
   },
   "engines": {
     "node": ">=24"
@@ -6192,157 +6199,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(),
@@ -6375,8 +6246,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(),
@@ -6422,7 +6292,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
 
@@ -6460,8 +6330,6 @@ async function createPackage(packageName, options) {
     await fs9.writeFile(path5.join(packageDir, "tsconfig.json"), tsconfigTemplate);
     await fs9.mkdir(path5.join(packageDir, "src", "tasks"), { recursive: true });
     await fs9.writeFile(path5.join(packageDir, "src", "index.ts"), indexTsTemplate(registryPrefix));
-    await fs9.writeFile(path5.join(packageDir, "src", "registry.ts"), registryTsTemplate);
-    await fs9.writeFile(path5.join(packageDir, "src", "task.ts"), taskWrapperTsTemplate);
     await fs9.writeFile(path5.join(packageDir, "src", "tasks", "hello.ts"), sampleTaskTsTemplate);
     await fs9.writeFile(path5.join(packageDir, "README.md"), readmeTemplate(packageJsonName, registryPrefix, true));
     await fs9.writeFile(path5.join(packageDir, ".gitignore"), gitignoreTemplate);
@@ -6469,8 +6337,6 @@ async function createPackage(packageName, options) {
     await fs9.writeFile(path5.join(packageDir, "package.json"), packageJsonJsTemplate(packageJsonName));
     await fs9.mkdir(path5.join(packageDir, "src", "tasks"), { recursive: true });
     await fs9.writeFile(path5.join(packageDir, "src", "index.js"), indexJsTemplate(registryPrefix));
-    await fs9.writeFile(path5.join(packageDir, "src", "registry.js"), registryJsTemplate);
-    await fs9.writeFile(path5.join(packageDir, "src", "task.js"), taskWrapperJsTemplate);
     await fs9.writeFile(path5.join(packageDir, "src", "tasks", "hello.js"), sampleTaskJsTemplate);
     await fs9.writeFile(path5.join(packageDir, "README.md"), readmeTemplate(packageJsonName, registryPrefix, false));
     await fs9.writeFile(path5.join(packageDir, ".gitignore"), gitignoreTemplate);