@hypit/hypit 0.1.9 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypit/hypit",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "homepage": "https://hypit.ai",
   "repository": {
     "type": "git",

package/packages/package-loader-node/src/location.ts

@@ -81,8 +81,14 @@ export function declaredExternalPackageRoot(root: string, from: string | URL, na
   while (true) {
     const manifest = join(cursor, "package.json");
     if (existsSync(manifest)) {
-      const value = JSON.parse(readFileSync(manifest, "utf8")) as { dependencies?: Record<string, string> };
-      const version = value.dependencies?.[name];
+      const value = JSON.parse(readFileSync(manifest, "utf8")) as {
+        dependencies?: Record<string, string>;
+        optionalDependencies?: Record<string, string>;
+      };
+      // An upstream asset a package ships as optional is still selected by one exact version here.
+      // `hypit packages install` places it under the machine npm root named by this selection, so
+      // reading only the required map makes the documented repair unusable for every optional asset.
+      const version = value.dependencies?.[name] ?? value.optionalDependencies?.[name];
       return version === undefined ? undefined : externalPackageInstallRoot(root, name, version);
     }
     const parent = dirname(cursor);

package/packages/provider-hyperframes-local/src/capture-bootstrap.ts

@@ -0,0 +1,25 @@
+/**
+ * Preloaded into the disposable capture process, which never enters `bin/hypit.mjs`.
+ *
+ * `module.registerHooks` is process-local, so the resolver the launcher installs does not
+ * reach a child that Node starts directly. This registers the same resolution environment
+ * in the child, so its view of `@hypit/*` and of the machine packages those modules declare
+ * is identical to its parent's.
+ *
+ * Only relative paths can be used here: no hook exists yet, and a Distribution ships its
+ * package sources without any `node_modules` link between them.
+ */
+import { resolve } from "node:path";
+
+// `bin/hypit.mjs` publishes this for every process it starts; the fallback mirrors
+// `packages/video-cli/src/distribution.ts` for callers that import a Distribution directly.
+const distributionRoot = resolve(
+  process.env.HYPIT_DISTRIBUTION_ROOT ?? resolve(import.meta.dirname, "../../.."),
+);
+
+const { installDistributionPackageResolution, installExternalPackageResolution } =
+  await import("../../package-loader-node/src/distribution-resolution.js");
+installDistributionPackageResolution([distributionRoot]);
+
+const { hypitHostPackageRoot } = await import("../../runtime-host-node/src/index.js");
+installExternalPackageResolution([hypitHostPackageRoot()]);

package/packages/provider-hyperframes-local/src/capture-process.ts

@@ -62,7 +62,13 @@ export async function runCaptureProcess(
 ): Promise<void> {
   signal.throwIfAborted();
   await new Promise<void>((resolve, reject) => {
-    const child = spawn(process.execPath, ["--import", import.meta.resolve("tsx"), fileURLToPath(entry)], {
+    // The launcher's resolver hooks are process-local, so this child preloads the same
+    // environment before it imports any package the Distribution owns.
+    const child = spawn(process.execPath, [
+      "--import", import.meta.resolve("tsx"),
+      "--import", new URL("./capture-bootstrap.ts", import.meta.url).href,
+      fileURLToPath(entry),
+    ], {
       detached: process.platform !== "win32", windowsHide: true,
       stdio: ["ignore", "pipe", "pipe", "ipc"],
     });

package/packages/provider-hypihub/src/provider.ts

@@ -1,3 +1,4 @@
+import { readFileSync } from "node:fs";
 import { requestDeadline } from "@hypit/runtime-kit";
 import type { AsyncEndpoint, EndpointCredential, EndpointFulfillment, EndpointInvocationContext, EndpointPollContext, EndpointPricingReader, EndpointStartContext, EndpointOutcome, ImmediateEndpointHandler } from "@hypit/endpoint-kit";
 import { defineEndpointPackage, wakeAfter } from "@hypit/endpoint-kit";
@@ -23,6 +24,29 @@ import { createHypiHubAuth, hypiHubCredentialNeedsRefresh } from "./oauth.js";
 import type { HypiHubAuth } from "./oauth.js";
 import { HypiHubHttpError, HypiHubServiceError, hypiHubJobFailure } from "./errors.js";
 
+function distributionVersion(): string {
+  try {
+    const manifest = JSON.parse(readFileSync(new URL("../../../package.json", import.meta.url), "utf8")) as {
+      readonly name?: unknown; readonly version?: unknown;
+    };
+    if (manifest.name !== "@hypit/hypit" || typeof manifest.version !== "string" || manifest.version.length === 0) {
+      return "unknown";
+    }
+    return manifest.version;
+  } catch {
+    return "unknown";
+  }
+}
+
+const userAgent = `hypit/${distributionVersion()}`;
+
+const identifiedFetch = (fetcher: typeof globalThis.fetch): typeof globalThis.fetch =>
+  async (input, init) => {
+    const headers: Record<string, string> = { "user-agent": userAgent };
+    new Headers(init?.headers).forEach((value, name) => { headers[name] = value; });
+    return await fetcher(input, { ...init, headers });
+  };
+
 export const hypiHubProviderModuleRef = { name: "@hypit/provider-hypihub", version: "1" } as const;
 
 export type CreateHypiHubProviderOptions = {
@@ -113,7 +137,7 @@ class HypiHubClient {
     this.timeout = options.timeout;
     this.oauthTimeout = options.oauthTimeout;
     this.downloadAttempts = options.downloadAttempts;
-    this.fetcher = options.fetcher;
+    this.fetcher = identifiedFetch(options.fetcher);
     this.uploader = new HypiHubUploader({
       baseUrl: this.baseUrl,
       requestTimeoutMs: this.timeout,