@minimalcorp/tsunagi 0.1.30 → 0.1.31

package/dist/server/lib/llm-process.js

@@ -4,6 +4,7 @@ import * as os from 'node:os';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { killProcessOnPort } from './process-port.js';
+import { findPython, isVenvUpToDate, PYTHON_NOT_FOUND_MESSAGE, writeVenvMarker, } from './python-venv.js';
 const MODEL = 'mlx-community/Qwen3-30B-A3B-Instruct-2507-4bit';
 const LLM_SERVER_URL = process.env.TSUNAGI_LLM_SERVER_URL || 'http://127.0.0.1:8766';
 // run.shが待受けるポート固定値(host.docker.internal経由URLと違い、停止処理は
@@ -40,9 +41,6 @@ export function findLlmServerDir() {
 function venvPython() {
     return path.join(VENV_DIR, 'bin', 'python3');
 }
-function isVenvReady() {
-    return fs.existsSync(venvPython());
-}
 function isModelReady() {
     const snapshotsDir = path.join(MODEL_CACHE_DIR, 'snapshots');
     if (!fs.existsSync(snapshotsDir))
@@ -135,11 +133,17 @@ async function trackModelDownload(child) {
 }
 async function runSetupAndStart(dir) {
     const hfEnv = { ...process.env, HF_HOME: HF_CACHE_DIR, HF_HUB_DISABLE_XET: '1' };
-    if (!isVenvReady()) {
+    const requirementsFile = path.join(dir, 'requirements.txt');
+    if (!isVenvUpToDate(VENV_DIR, requirementsFile)) {
         currentStep = 'installing_deps';
+        const pythonBin = findPython();
+        if (!pythonBin)
+            throw new Error(PYTHON_NOT_FOUND_MESSAGE);
         fs.mkdirSync(TSUNAGI_LLM_DIR, { recursive: true });
-        await runStep('python3', ['-m', 'venv', VENV_DIR], dir);
+        fs.rmSync(VENV_DIR, { recursive: true, force: true });
+        await runStep(pythonBin, ['-m', 'venv', VENV_DIR], dir);
         await runStep(venvPython(), ['-m', 'pip', 'install', '-r', 'requirements.txt'], dir);
+        writeVenvMarker(VENV_DIR, requirementsFile);
     }
     if (!isModelReady()) {
         currentStep = 'downloading_model';

package/dist/server/lib/python-venv.d.ts

@@ -0,0 +1,4 @@
+export declare function findPython(): string | null;
+export declare const PYTHON_NOT_FOUND_MESSAGE = "Python 3.10\u4EE5\u4E0A\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002'brew install python@3.12' \u7B49\u3067\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\u3002";
+export declare function isVenvUpToDate(venvDir: string, requirementsFile: string): boolean;
+export declare function writeVenvMarker(venvDir: string, requirementsFile: string): void;

package/dist/server/lib/python-venv.js

@@ -0,0 +1,66 @@
+import { execFileSync } from 'node:child_process';
+import * as crypto from 'node:crypto';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+// mlx/mlx-lm/mlx-whisper の固定バージョンが requires-python >=3.10 のため、venv作成に
+// 使う python3 自体も 3.10 以上でなければ pip install がそもそも失敗する。`python3` という
+// 名前が PATH 上のどのバージョンを指すかは環境依存(古い macOS 付属 Python 等)なため、
+// 候補を新しい順に探して最初に見つかった 3.10 以上を使う。
+const MIN_PYTHON_VERSION = '3.10';
+const PYTHON_CANDIDATES = [
+    'python3.14',
+    'python3.13',
+    'python3.12',
+    'python3.11',
+    'python3.10',
+    'python3',
+];
+function pythonVersion(bin) {
+    try {
+        return execFileSync(bin, ['-c', 'import sys; print("%d.%d" % sys.version_info[:2])'], {
+            encoding: 'utf8',
+        }).trim();
+    }
+    catch {
+        return null;
+    }
+}
+function versionAtLeast(version, min) {
+    const [vMajor, vMinor] = version.split('.').map(Number);
+    const [mMajor, mMinor] = min.split('.').map(Number);
+    return vMajor !== mMajor ? vMajor > mMajor : vMinor >= mMinor;
+}
+export function findPython() {
+    for (const cand of PYTHON_CANDIDATES) {
+        const version = pythonVersion(cand);
+        if (version && versionAtLeast(version, MIN_PYTHON_VERSION))
+            return cand;
+    }
+    return null;
+}
+export const PYTHON_NOT_FOUND_MESSAGE = `Python ${MIN_PYTHON_VERSION}以上が見つかりません。'brew install python@3.12' 等でインストールしてください。`;
+function venvMarkerPath(venvDir) {
+    return path.join(venvDir, '.requirements.sha256');
+}
+function requirementsHash(requirementsFile) {
+    return crypto.createHash('sha256').update(fs.readFileSync(requirementsFile)).digest('hex');
+}
+// venvが「存在するだけ」でなく、実際に使えるかを検証する。
+// - venv作成に使われた python が 3.10 未満だと mlx 系のインストールに失敗するバージョンのまま放置される
+// - requirements.txt のバージョン指定を後から変更しても、既存venvには反映されない
+// のいずれかが起きていないかを、venv自身のpythonバージョンと記録済みハッシュから判定する。
+export function isVenvUpToDate(venvDir, requirementsFile) {
+    const venvPython = path.join(venvDir, 'bin', 'python3');
+    if (!fs.existsSync(venvPython))
+        return false;
+    const version = pythonVersion(venvPython);
+    if (!version || !versionAtLeast(version, MIN_PYTHON_VERSION))
+        return false;
+    const marker = venvMarkerPath(venvDir);
+    if (!fs.existsSync(marker))
+        return false;
+    return fs.readFileSync(marker, 'utf8').trim() === requirementsHash(requirementsFile);
+}
+export function writeVenvMarker(venvDir, requirementsFile) {
+    fs.writeFileSync(venvMarkerPath(venvDir), requirementsHash(requirementsFile));
+}

package/dist/server/lib/whisper-process.js

@@ -4,6 +4,7 @@ import * as os from 'node:os';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { killProcessOnPort } from './process-port.js';
+import { findPython, isVenvUpToDate, PYTHON_NOT_FOUND_MESSAGE, writeVenvMarker, } from './python-venv.js';
 const WHISPER_SERVER_URL = process.env.TSUNAGI_WHISPER_SERVER_URL || 'http://127.0.0.1:8765';
 // run.shが待受けるポート固定値(host.docker.internal経由URLと違い、停止処理は
 // 必ずこのNodeプロセスと同じホスト上のポートを対象にする必要があるため分けて持つ)。
@@ -34,9 +35,6 @@ export function findWhisperServerDir() {
 function venvPython() {
     return path.join(VENV_DIR, 'bin', 'python3');
 }
-function isVenvReady() {
-    return fs.existsSync(venvPython());
-}
 function isModelReady() {
     const snapshotsDir = path.join(MODEL_CACHE_DIR, 'snapshots');
     if (!fs.existsSync(snapshotsDir))
@@ -129,11 +127,17 @@ async function trackModelDownload(child) {
 }
 async function runSetupAndStart(dir) {
     const hfEnv = { ...process.env, HF_HOME: HF_CACHE_DIR, HF_HUB_DISABLE_XET: '1' };
-    if (!isVenvReady()) {
+    const requirementsFile = path.join(dir, 'requirements.txt');
+    if (!isVenvUpToDate(VENV_DIR, requirementsFile)) {
         currentStep = 'installing_deps';
+        const pythonBin = findPython();
+        if (!pythonBin)
+            throw new Error(PYTHON_NOT_FOUND_MESSAGE);
         fs.mkdirSync(TSUNAGI_WHISPER_DIR, { recursive: true });
-        await runStep('python3', ['-m', 'venv', VENV_DIR], dir);
+        fs.rmSync(VENV_DIR, { recursive: true, force: true });
+        await runStep(pythonBin, ['-m', 'venv', VENV_DIR], dir);
         await runStep(venvPython(), ['-m', 'pip', 'install', '-r', 'requirements.txt'], dir);
+        writeVenvMarker(VENV_DIR, requirementsFile);
     }
     if (!isModelReady()) {
         currentStep = 'downloading_model';

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@minimalcorp/tsunagi",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@minimalcorp/tsunagi",
-      "version": "0.1.30",
+      "version": "0.1.31",
       "license": "SEE LICENSE IN LICENSE",
       "os": [
         "darwin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minimalcorp/tsunagi",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "Multi-repo GitHub project management with Claude AI integration, designed for visualizing and controlling AI-driven development locally.",
   "keywords": [
     "tsunagi",