@hypit/hypit 0.1.12 → 0.1.14

package/packages/video-cli/package.json

@@ -13,6 +13,7 @@
     "@hypit/cli": "workspace:*",
     "@hypit/compiler-markup-node": "workspace:*",
     "@hypit/composition": "workspace:*",
+    "@hypit/credential-store-file": "workspace:*",
     "@hypit/credential-store-os": "workspace:*",
     "@hypit/driver-node": "workspace:*",
     "@hypit/estimate": "workspace:*",

package/packages/video-cli/src/distribution.ts

@@ -12,8 +12,7 @@ import {
 
 // The Distribution root is the replaceable Hypit tool checkout, not this
 // package's source directory and never the author's project.
-const packageRoot = resolve(process.env.HYPIT_DISTRIBUTION_ROOT ?? resolve(import.meta.dirname, "../../.."));
-const installedLauncher = process.env.HYPIT_CLI_LAUNCHER;
+const packageRoot = resolve(import.meta.dirname, "../../..");
 const defaultBuildResultRepository = {
   use: "@hypit/build-result-fs",
   config: { path: ".hypit/results" },
@@ -57,14 +56,8 @@ export const videoCliDistribution: CliDistribution = {
       : { distributionPackageRoot: options.distributionPackageRoot }),
     workerLaunch: {
       command: process.execPath,
-      // The repository launcher registers TypeScript support before entering the CLI.
-      // Tests that import this Distribution directly keep the current Node arguments.
-      args: installedLauncher === undefined
-        ? [
-            ...process.execArgv.filter((item) => !item.startsWith("--test")),
-            fileURLToPath(new URL("./cli.ts", import.meta.url)),
-          ]
-        : [installedLauncher],
+      // The loaded Distribution owns its Worker entry and TypeScript/package resolution.
+      args: [fileURLToPath(new URL("../../../bin/hypit.mjs", import.meta.url))],
     },
   }),
   openProjectResults: async (projectRoot, options) => {

package/packages/video-cli/src/version.ts

@@ -20,7 +20,7 @@ export function writeVersionHelp(io: CliIo): void {
 /** Installation discovery belongs to the executable, independent of video execution and Skill installers. */
 export async function runVersionCli(argv: readonly string[], io: CliIo, environment: VersionEnvironment = {
   packageRoot: resolve(import.meta.dirname, "../../.."),
-  ...(process.env.HYPIT_CLI_LAUNCHER === undefined ? {} : { launcher: process.env.HYPIT_CLI_LAUNCHER }),
+  launcher: resolve(import.meta.dirname, "../../../bin/hypit.mjs"),
   fetch: globalThis.fetch,
 }): Promise<void> {
   let check = false;

package/packages/workspace-fs-node/src/workspace.ts

@@ -2,7 +2,7 @@ import { pathToFileURL } from "node:url";
 import { randomUUID } from "node:crypto";
 import { createReadStream } from "node:fs";
 import { readFile, realpath, stat } from "node:fs/promises";
-import { basename, dirname, isAbsolute, relative, resolve } from "node:path";
+import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
 
 import type {
   Awaitable,
@@ -20,7 +20,7 @@ import type { BlobRef } from "@hypit/protocol";
 
 function isWithin(root: string, path: string): boolean {
   const relation = relative(root, path);
-  return relation === "" || (!relation.startsWith("..") && !isAbsolute(relation));
+  return relation === "" || (relation !== ".." && !relation.startsWith(`..${sep}`) && !isAbsolute(relation));
 }
 
 export type NodeFilesystemExternalSource = {

package/packages/yt-dlp/README.md

@@ -17,8 +17,9 @@ Runtime Profile and creates no Build.
 - `downloadVideo(url, target)` downloads one video to the given path. Its caller owns destination
   preparation and overwrite policy. The target extension must be `.mp4`, `.mkv`, `.webm` or `.mov`.
 
-The downloader invokes the locked Python project in `services/yt-dlp` through `uv`, located relative
-to the installed Distribution. Ship its `pyproject.toml` and `uv.lock` with this package's source.
+The downloader locates its declared `@hypit/yt-dlp-service-runtime` package through the active
+Distribution/package resolver and invokes that package's locked Python project through `uv`.
+Ship its `pyproject.toml` and `uv.lock`; the caller's location and a `services/` ancestor are irrelevant.
 `uv` and `ffmpeg` must be available on PATH; the CLI also uses `ffprobe` to report the saved media.
 
 The request selects `bv*+ba/b`, with `res:1080,vcodec:h264` format preferences and `--no-playlist`.

package/packages/yt-dlp/package.json

@@ -6,5 +6,9 @@
   "type": "module",
   "exports": {
     ".": "./src/index.ts"
+  },
+  "dependencies": {
+    "@hypit/package-loader-node": "workspace:*",
+    "@hypit/yt-dlp-service-runtime": "workspace:*"
   }
 }

package/packages/yt-dlp/src/download.ts

@@ -11,11 +11,11 @@
  * the same shape WhisperX and OpenCV already use for their Python programs.
  */
 import { spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
 import { copyFile, mkdtemp, readdir, rename, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { dirname, extname, join } from "node:path";
-import { fileURLToPath } from "node:url";
+
+import { resolveNodePackageResource } from "@hypit/package-loader-node";
 
 /**
  * Whether this is a link to fetch rather than a path to open.
@@ -34,20 +34,16 @@ export function isVideoUrl(value: string): boolean {
 }
 
 /**
- * The uv project holding the pinned `yt-dlp`, found by walking up from this module rather than from
- * the working directory, which is wherever the author happened to run the command from.
+ * The locked uv project is a Distribution package asset, the same way WhisperX and
+ * OpenCV locate their Python programs. Walking parents of this file only works
+ * while the module still sits above `services/` in a contributor checkout.
  */
 function serviceProject(): string {
-  let directory = dirname(fileURLToPath(import.meta.url));
-  while (true) {
-    const candidate = join(directory, "services", "yt-dlp", "pyproject.toml");
-    if (existsSync(candidate)) return dirname(candidate);
-    const parent = dirname(directory);
-    if (parent === directory) {
-      throw new Error("no services/yt-dlp project above this module; the Distribution is incomplete");
-    }
-    directory = parent;
-  }
+  return dirname(resolveNodePackageResource(
+    "@hypit/yt-dlp-service-runtime",
+    "pyproject.toml",
+    { from: import.meta.url },
+  ));
 }
 
 /**