@roll-agent/octopus-agent 0.0.7 → 0.0.9

package/README.md

@@ -13,7 +13,7 @@
 ## 本地运行
 
 ```bash
-python -m octopus_sponge_skill "查询我能看到的品牌列表"
+python -m octopus_skill "查询我能看到的品牌列表"
 ```
 
 运行参数由 Agent 内置；用户本地只需要配置 Sponge MCP Server 地址和 Token。
@@ -31,9 +31,15 @@ roll agent install @roll-agent/octopus-agent
 roll run octopus-agent diagnostic_status --json
 ```
 
-该 npm package（npm 包）直接包含 Python 源码；`roll agent install` 不会再从 PyPI 下载 `octopus-sponge-skill`。
-安装机器需要 Python 3.11+。Windows、macOS、Linux 都会检查 `python --version` 和 `python3 --version`，任意一个可用即可。
-安装阶段只执行 Python 环境检查；没有 Python 3.11+ 时会提示手动安装，不会自动安装。
+该 npm package（npm 包）直接包含 Python 源码；`roll agent install` 不会再从 PyPI 下载 `octopus-skill`。
+安装机器上需要有 Python 3.11+。Agent 启动时会自动尝试 `python3`、`python`、`py -3.11`、`py -3`。
+如果 Python 命令不在这些名称里，可以配置 `OCTOPUS_PYTHON_COMMAND`（Python 命令），例如：
+
+```powershell
+roll config set agents.env.octopus-agent.OCTOPUS_PYTHON_COMMAND "py -3.11"
+```
+
+Windows 用户只要安装 Python 3.11+，通常不需要额外创建 `python3` 别名。
 
 ### 本地源码注册
 
@@ -85,14 +91,12 @@ roll run octopus-agent query_sponge --json \
     "runtime": {"ownership": "on-demand", "transport": "stdio"},
     "start": {
       "command": "node",
-      "args": ["bin/start-roll-server.js"]
+      "args": ["scripts/start-octopus-agent.js"]
     }
   }
 }
 ```
 
-`start-roll-server.js` 会按系统选择 Python 命令：Windows 优先 `python`，macOS/Linux 优先 `python3`；都不可用或版本低于 3.11 时会报错提示安装。
-
 环境变量可放到 `roll.config.yaml`：
 
 ```yaml

package/{octopus_sponge_skill → octopus_skill}/__init__.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-_src_package = Path(__file__).resolve().parent.parent / "src" / "octopus_sponge_skill"
+_src_package = Path(__file__).resolve().parent.parent / "src" / "octopus_skill"
 if _src_package.exists():
     __path__.append(str(_src_package))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roll-agent/octopus-agent",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "丸子Agent（Octopus Agent）",
   "license": "UNLICENSED",
   "keywords": [
@@ -11,13 +11,10 @@
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "postinstall": "node bin/check-python.js"
-  },
   "files": [
-    "bin",
-    "octopus_sponge_skill",
+    "octopus_skill",
     "src",
+    "scripts",
     "references",
     "SKILL.md",
     "pyproject.toml",
@@ -33,7 +30,7 @@
     "start": {
       "command": "node",
       "args": [
-        "bin/start-roll-server.js"
+        "scripts/start-octopus-agent.js"
       ]
     }
   }

package/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "octopus-skill"
-version = "0.0.7"
+version = "0.0.9"
 description = "丸子Agent（Octopus Agent）"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = []
 
 [project.scripts]
-octopus-sponge = "octopus_sponge_skill.main:main"
+octopus-agent = "octopus_skill.main:main"
 
 [build-system]
 requires = ["setuptools>=68"]

package/scripts/start-octopus-agent.js

@@ -0,0 +1,128 @@
+#!/usr/bin/env node
+"use strict";
+
+const { spawn, spawnSync } = require("node:child_process");
+const path = require("node:path");
+
+const MIN_MAJOR = 3;
+const MIN_MINOR = 11;
+const VERSION_CHECK = [
+  "import sys",
+  `raise SystemExit(0 if sys.version_info >= (${MIN_MAJOR}, ${MIN_MINOR}) else 1)`,
+].join("; ");
+
+function splitCommand(value) {
+  const parts = [];
+  let current = "";
+  let quote = null;
+
+  for (let index = 0; index < value.length; index += 1) {
+    const char = value[index];
+    if ((char === '"' || char === "'") && quote === null) {
+      quote = char;
+      continue;
+    }
+    if (char === quote) {
+      quote = null;
+      continue;
+    }
+    if (/\s/.test(char) && quote === null) {
+      if (current) {
+        parts.push(current);
+        current = "";
+      }
+      continue;
+    }
+    current += char;
+  }
+
+  if (current) {
+    parts.push(current);
+  }
+  return parts;
+}
+
+function configuredCandidate() {
+  const value = process.env.OCTOPUS_PYTHON_COMMAND;
+  if (!value) {
+    return null;
+  }
+
+  const [command, ...args] = splitCommand(value);
+  if (!command) {
+    return null;
+  }
+  return { command, args, source: "OCTOPUS_PYTHON_COMMAND" };
+}
+
+function pythonCandidates() {
+  return [
+    configuredCandidate(),
+    { command: "python3", args: [], source: "python3" },
+    { command: "python", args: [], source: "python" },
+    { command: "py", args: ["-3.11"], source: "py -3.11" },
+    { command: "py", args: ["-3"], source: "py -3" },
+  ].filter(Boolean);
+}
+
+function isUsablePython(candidate) {
+  const result = spawnSync(candidate.command, [...candidate.args, "-c", VERSION_CHECK], {
+    encoding: "utf8",
+    stdio: "ignore",
+  });
+  return result.status === 0;
+}
+
+function findPython() {
+  return pythonCandidates().find(isUsablePython);
+}
+
+const python = findPython();
+if (!python) {
+  console.error(
+    [
+      `Octopus Agent requires Python ${MIN_MAJOR}.${MIN_MINOR}+.`,
+      "Install Python 3.11+ and make one of these commands available:",
+      "python3, python, py -3.11, py -3",
+      "Or set OCTOPUS_PYTHON_COMMAND to the Python command.",
+    ].join("\n")
+  );
+  process.exit(1);
+}
+
+const packageRoot = path.resolve(__dirname, "..");
+
+function buildPythonPath() {
+  return [
+    path.join(packageRoot, "src"),
+    packageRoot,
+    ...(process.env.PYTHONPATH ? process.env.PYTHONPATH.split(path.delimiter).filter(Boolean) : []),
+  ].join(path.delimiter);
+}
+
+const child = spawn(
+  python.command,
+  [...python.args, "-m", "octopus_skill.octopus_run", ...process.argv.slice(2)],
+  {
+    cwd: packageRoot,
+    env: {
+      ...process.env,
+      PYTHONPATH: buildPythonPath(),
+    },
+    stdio: "inherit",
+    windowsHide: true,
+  }
+);
+
+child.on("error", (error) => {
+  console.error(`Failed to start Python via ${python.source}: ${error.message}`);
+  process.exit(1);
+});
+
+child.on("exit", (code, signal) => {
+  if (signal) {
+    process.kill(process.pid, signal);
+    return;
+  }
+  process.exit(code ?? 0);
+});

package/src/{octopus_sponge_skill → octopus_skill}/_version.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.0.7"
+__version__ = "0.0.9"

package/src/{octopus_sponge_skill → octopus_skill}/main.py

@@ -7,7 +7,7 @@ from .config import load_config_from_env
 
 
 def main() -> None:
-    parser = argparse.ArgumentParser(prog="octopus-sponge")
+    parser = argparse.ArgumentParser(prog="octopus-agent")
     parser.add_argument("question")
     parser.add_argument("--session-id")
     args = parser.parse_args()

package/bin/check-python.js

@@ -1,85 +0,0 @@
-#!/usr/bin/env node
-
-const { spawnSync } = require("child_process");
-
-const MIN_VERSION = [3, 11, 0];
-
-function pythonCandidates() {
-  return [["python"], ["python3"]];
-}
-
-function parseVersion(output) {
-  const match = String(output).match(/Python\s+(\d+)\.(\d+)\.(\d+)/);
-  if (!match) {
-    return null;
-  }
-  return match.slice(1).map((part) => Number(part));
-}
-
-function versionLabel(version) {
-  return version.join(".");
-}
-
-function isSupported(version) {
-  for (let index = 0; index < MIN_VERSION.length; index += 1) {
-    if (version[index] > MIN_VERSION[index]) return true;
-    if (version[index] < MIN_VERSION[index]) return false;
-  }
-  return true;
-}
-
-function commandLabel(command) {
-  return command.join(" ");
-}
-
-function run(command, args, options = {}) {
-  return spawnSync(command[0], [...command.slice(1), ...args], {
-    encoding: "utf8",
-    stdio: options.stdio || ["ignore", "pipe", "pipe"],
-  });
-}
-
-function findPython() {
-  const checked = [];
-  for (const command of pythonCandidates()) {
-    const result = run(command, ["--version"]);
-    const output = `${result.stdout || ""}${result.stderr || ""}`;
-    const version = parseVersion(output);
-    if (result.status === 0 && version && isSupported(version)) {
-      return { command, version, checked };
-    }
-    checked.push({
-      command,
-      reason: version
-        ? `当前版本 ${versionLabel(version)}，需要 ${versionLabel(MIN_VERSION)}+`
-        : "未找到或无法读取版本",
-    });
-  }
-  return { command: null, version: null, checked };
-}
-
-function printInstallHelp() {
-  console.error("未找到 Python 3.11+。请手动安装后重试。");
-  console.error("Windows/macOS/Linux: 安装后确认 `python --version` 或 `python3 --version` 可用。");
-}
-
-function main() {
-  let result = findPython();
-  if (result.command) {
-    console.log(
-      `Found Python ${versionLabel(result.version)}: ${commandLabel(
-        result.command
-      )}`
-    );
-    return;
-  }
-
-  for (const item of result.checked) {
-    console.error(`${commandLabel(item.command)}: ${item.reason}`);
-  }
-
-  printInstallHelp();
-  process.exit(1);
-}
-
-main();

package/bin/start-roll-server.js

@@ -1,109 +0,0 @@
-#!/usr/bin/env node
-
-const { spawn, spawnSync } = require("child_process");
-
-const MIN_VERSION = [3, 11, 0];
-
-function pythonCandidates() {
-  if (process.platform === "win32") {
-    return [["python"], ["python3"]];
-  }
-  return [["python3"], ["python"]];
-}
-
-function parseVersion(output) {
-  const match = String(output).match(/Python\s+(\d+)\.(\d+)\.(\d+)/);
-  if (!match) {
-    return null;
-  }
-  return match.slice(1).map((part) => Number(part));
-}
-
-function versionLabel(version) {
-  return version.join(".");
-}
-
-function isSupported(version) {
-  for (let index = 0; index < MIN_VERSION.length; index += 1) {
-    if (version[index] > MIN_VERSION[index]) return true;
-    if (version[index] < MIN_VERSION[index]) return false;
-  }
-  return true;
-}
-
-function commandLabel(command) {
-  return command.join(" ");
-}
-
-function findPython() {
-  const checked = [];
-  for (const command of pythonCandidates()) {
-    const result = spawnSync(command[0], [...command.slice(1), "--version"], {
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "pipe"],
-    });
-    const output = `${result.stdout || ""}${result.stderr || ""}`;
-    const version = parseVersion(output);
-    if (result.status === 0 && version && isSupported(version)) {
-      return { command, version, checked };
-    }
-    checked.push({
-      command,
-      reason: version
-        ? `当前版本 ${versionLabel(version)}，需要 ${versionLabel(MIN_VERSION)}+`
-        : "未找到或无法读取版本",
-    });
-  }
-  return { command: null, version: null, checked };
-}
-
-function printPythonError(checked) {
-  for (const item of checked) {
-    console.error(`${commandLabel(item.command)}: ${item.reason}`);
-  }
-  console.error("未找到 Python 3.11+，无法启动 octopus-agent。");
-  console.error("Windows: 请安装 Python 3.11+，并确认 `python --version` 可用。");
-  console.error(
-    "macOS/Linux: 请安装 Python 3.11+，并确认 `python3 --version` 可用。"
-  );
-}
-
-function main() {
-  const passthroughArgs = process.argv.slice(2);
-  const checkOnly = passthroughArgs[0] === "--check";
-  const serverArgs = checkOnly ? [] : passthroughArgs;
-  const result = findPython();
-
-  if (!result.command) {
-    printPythonError(result.checked);
-    process.exit(1);
-  }
-
-  if (checkOnly) {
-    console.log(
-      `${commandLabel(result.command)} ${versionLabel(result.version)}`
-    );
-    return;
-  }
-
-  const child = spawn(
-    result.command[0],
-    [...result.command.slice(1), "-m", "octopus_sponge_skill.roll_server", ...serverArgs],
-    { stdio: "inherit" }
-  );
-
-  child.on("exit", (code, signal) => {
-    if (signal) {
-      process.kill(process.pid, signal);
-      return;
-    }
-    process.exit(code || 0);
-  });
-
-  child.on("error", (error) => {
-    console.error(`启动 Python 失败: ${error.message}`);
-    process.exit(1);
-  });
-}
-
-main();