@follenfang/fupload 0.0.7 → 0.0.9

package/README.md

@@ -42,7 +42,7 @@ fupload/
 - 网易 DD：Windows、Python 3、已安装并登录官方客户端
 - Heybox Workshop：Windows、Python 3、已安装并登录 Heybox 桌面客户端
 
-npm 安装和 `fupload update` 会在用户状态目录中创建 Fuploader 专用 Python venv，并自动安装 Heybox ZIP 上传所需的腾讯官方 COS SDK；不会修改系统 Python。使用 `npm --ignore-scripts` 安装时，首次运行实际 CLI 命令会校验并补齐该 runtime。
+npm 安装和 `fupload update` 会在用户状态目录中创建 Fuploader 专用 Python venv，优先使用可用的 `uv` 向其中安装固定版本依赖，并自动安装 Heybox ZIP 上传所需的腾讯官方 COS SDK；未安装 `uv` 时回退到 venv 自带的 pip，不会修改系统 Python。使用 `npm --ignore-scripts` 安装时，首次运行实际 CLI 命令会校验并补齐该 runtime。
 
 官方 `ncc` 的安装命令为 `npm i -g @newbeebox/newbeebox-creator-center-cli@latest`。Fuploader 不读取其凭据文件；用户在自己的终端完成 `ncc login`，Agent 仅用 `ncc whoami -o json` 验证。自动化可在启动 Agent 前注入 `NCC_TOKEN`，令牌不得写入命令参数、项目文件或 Git。
 

package/fupload/SKILL.md

@@ -2,7 +2,7 @@
 name: fupload
 description: Explicit author-publishing workflow for World of Warcraft plugins, configuration shares, and WA/strings on NewBeeBox, NetEase DD, CurseForge, and Heybox Workshop, including CurseForge author project lookup, plugin ZIP upload, and Heybox web-session version management. Use only when the user explicitly invokes `$fupload`, explicitly asks to use the Fupload Skill, or loads this Skill by path. Do not trigger from ordinary mentions of publishing, NewBeeBox, DD, CurseForge, Heybox, plugins, configurations, or WA.
 metadata:
-  version: "0.0.7"
+  version: "0.0.9"
 ---
 
 # Fupload

package/fupload/scripts/fupload_cli/__init__.py

@@ -1,3 +1,3 @@
 """Fupload Python CLI."""
 
-__version__ = "0.0.7"
+__version__ = "0.0.9"

package/npm/bin/fupload.mjs

@@ -76,7 +76,9 @@ async function main() {
     return 1;
   }
   const script = path.join(target, "scripts", "fupload.py");
-  const result = runPython(runtime.python, script, options.forwarded);
+  const result = runPython(runtime.python, script, options.forwarded, {
+    runtimeRoot: runtime.root,
+  });
   if (result.error) {
     emitError("PYTHON_LAUNCH_FAILED", result.error.message);
     return 1;

package/npm/lib/python.mjs

@@ -6,7 +6,7 @@ import path from "node:path";
 
 import { productStateRoot } from "./managed-install.mjs";
 
-export const PYTHON_RUNTIME_SCHEMA = "fupload.python-runtime.v1";
+export const PYTHON_RUNTIME_SCHEMA = "fupload.python-runtime.v2";
 const RUNTIME_DIRECTORY = "python";
 const RUNTIME_MARKER = "runtime.json";
 const RUNTIME_LOCK_WAIT_MS = 5 * 60 * 1000;
@@ -45,10 +45,30 @@ export function discoverPython({ platform = process.platform, minimumMinor = 9 }
   return null;
 }
 
+export function discoverUv({ run = spawnSync } = {}) {
+  const result = run("uv", ["--version"], {
+    encoding: "utf8",
+    shell: false,
+    windowsHide: true,
+  });
+  if (result.error || result.status !== 0) {
+    return null;
+  }
+  const match = result.stdout.trim().match(/^uv (\d+)\.(\d+)\.(\d+)(?:\s|$)/);
+  if (!match) {
+    return null;
+  }
+  return { command: "uv", args: [], version: match.slice(1).map(Number) };
+}
+
 export function runPython(python, script, args, options = {}) {
-  return spawnSync(python.command, [...python.args, script, ...args], {
+  const run = options.run || spawnSync;
+  const env = options.runtimeRoot
+    ? runtimeEnvironment(options.runtimeRoot, options.env || process.env)
+    : options.env || process.env;
+  return run(python.command, [...python.args, script, ...args], {
     cwd: options.cwd || process.cwd(),
-    env: options.env || process.env,
+    env,
     stdio: options.stdio || "inherit",
     encoding: options.encoding,
     shell: false,
@@ -125,7 +145,10 @@ function probeRuntime(executable, root, env, run = spawnSync) {
 
 function inspectRuntime({ root, platform, requirementsHash, env, run }) {
   const marker = readMarker(root);
-  if (marker?.schema !== PYTHON_RUNTIME_SCHEMA || marker.requirements_sha256 !== requirementsHash) {
+  if (
+    marker?.schema !== PYTHON_RUNTIME_SCHEMA ||
+    marker.requirements_sha256 !== requirementsHash
+  ) {
     return null;
   }
   const command = pythonRuntimeExecutable(root, platform);
@@ -206,6 +229,7 @@ export function ensurePythonRuntime({
   home = os.homedir(),
   run = spawnSync,
   discover = discoverPython,
+  discoverUv: locateUv = discoverUv,
 } = {}) {
   const requirements = pythonRequirementsFile(packageRoot);
   const content = fs.readFileSync(requirements);
@@ -214,7 +238,15 @@ export function ensurePythonRuntime({
   const parent = path.dirname(root);
   const lock = acquireRuntimeLock(root);
   try {
-    const current = inspectRuntime({ root, platform, requirementsHash, env, run });
+    const uv = locateUv({ run });
+    const dependencyInstaller = uv ? "uv" : "pip";
+    const current = inspectRuntime({
+      root,
+      platform,
+      requirementsHash,
+      env,
+      run,
+    });
     if (current) {
       return { status: "current", root, requirements, python: current };
     }
@@ -232,9 +264,22 @@ export function ensurePythonRuntime({
     try {
       runChecked(run, base.command, [...base.args, "-m", "venv", staging], "Could not create the Fuploader Python runtime");
       const stagingPython = pythonRuntimeExecutable(staging, platform);
-      runChecked(run, stagingPython, [
-        "-m", "pip", "install", "--disable-pip-version-check", "--no-input", "--requirement", requirements,
-      ], "Could not install Fuploader Python dependencies");
+      if (uv) {
+        runChecked(run, uv.command, [
+          ...uv.args,
+          "pip", "install",
+          "--python", stagingPython,
+          "--requirements", requirements,
+          "--link-mode", "copy",
+          "--no-config",
+          "--no-progress",
+          "--no-python-downloads",
+        ], "Could not install Fuploader Python dependencies with uv");
+      } else {
+        runChecked(run, stagingPython, [
+          "-m", "pip", "install", "--disable-pip-version-check", "--no-input", "--requirement", requirements,
+        ], "Could not install Fuploader Python dependencies");
+      }
       runChecked(run, stagingPython, [
         "-m", "playwright", "install", "chromium",
       ], "Could not install Fuploader Chromium", {
@@ -247,6 +292,8 @@ export function ensurePythonRuntime({
       writeMarker(staging, {
         schema: PYTHON_RUNTIME_SCHEMA,
         requirements_sha256: requirementsHash,
+        dependency_installer: dependencyInstaller,
+        dependency_installer_version: uv ? uv.version.join(".") : null,
         python_version: installed.version.join("."),
         dependency_version: installed.dependencyVersion,
         playwright_version: installed.playwrightVersion,
@@ -265,7 +312,13 @@ export function ensurePythonRuntime({
         }
         throw error;
       }
-      created = inspectRuntime({ root, platform, requirementsHash, env, run });
+      created = inspectRuntime({
+        root,
+        platform,
+        requirementsHash,
+        env,
+        run,
+      });
       if (!created) {
         fs.rmSync(root, { recursive: true, force: true });
         if (movedOld) {

package/npm/skill-manifest.json

@@ -1,9 +1,9 @@
 {
   "schema": "fupload.npm-skill-manifest.v1",
   "package_name": "@follenfang/fupload",
-  "package_version": "0.0.7",
-  "skill_version": "0.0.7",
-  "tree_sha256": "f2693bc26ecd3f9bab3ed691a2f372c5702b6ac5f72f52880fc6cee40ca90314",
+  "package_version": "0.0.9",
+  "skill_version": "0.0.9",
+  "tree_sha256": "515a7cdff306e466484f7974521025ca9072a3869cc021207a0e692dae977676",
   "files": [
     {
       "path": "agents/openai.yaml",
@@ -108,7 +108,7 @@
     {
       "path": "scripts/fupload_cli/__init__.py",
       "bytes": 49,
-      "sha256": "b44c52f9e6b2989921c93580a400ddcd3dd3e5c1cc787e9984baf0dabdfd93e7"
+      "sha256": "7762ec22ff37c14cc8942b1f136910050aea07e4e6904f98b3ab8434e6b89800"
     },
     {
       "path": "scripts/fupload_cli/blackbox_web.py",
@@ -188,7 +188,7 @@
     {
       "path": "SKILL.md",
       "bytes": 23242,
-      "sha256": "941f2c5f615dded9fcfe086516a9bf903f54db52351815c38d26c2691f71793b"
+      "sha256": "1b9e444846724b03ee3e2e0ab89f50b85d33c1dfc4edbcb19d64118af2412571"
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@follenfang/fupload",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "Install and run the Fuploader Agent Skill and Python CLI.",
   "type": "module",
   "bin": {