@minimalcorp/tsunagi 0.1.55 → 0.2.0

package/dist/cli.js

@@ -1,328 +1,190 @@
 #!/usr/bin/env node
-import { spawn, spawnSync } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import * as fs from 'node:fs';
-import * as http from 'node:http';
 import * as path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import openBrowser from 'open';
-import { cleanupPluginState, ensureCleanPluginState } from './plugin-lifecycle.js';
 import { acquireSingleInstanceLock } from './single-instance-lock.js';
+import { ENTRY_PROTOCOL, RESTART_EXIT_CODE, compareVersions, getBrokenVersions, getPackageRootOf, isInstalled, readEntryState, restoreSnapshot, updateEntryState, } from './versions.js';
 /**
- * Production CLI entrypoint shipped as `bin` in @minimalcorp/tsunagi.
+ * Entry: the `tsunagi` bin of @minimalcorp/tsunagi.
  *
- * Layout when installed via npm:
+ * This file stays on the user's machine until they reinstall the package,
+ * while the app (dist/app.js) is replaced by every auto-update. So it only
+ * starts the app and starts it again; every other decision belongs to the app.
+ * Follow the contract in versions.ts when changing anything here.
  *
- *   <pkg>/dist/cli.js                            ← this file
- *   <pkg>/dist/auto-migrate.js
- *   <pkg>/dist/plugin-lifecycle.js
- *   <pkg>/dist/single-instance-lock.js
- *   <pkg>/dist/server/index.js                   ← Fastify entry (bundled from apps/server/dist)
- *   <pkg>/dist/server/lib/**
- *   <pkg>/dist/server/generated/prisma/**
- *   <pkg>/.next/standalone/apps/web/server.js    ← Next.js standalone entry (bundled from apps/web/.next/standalone)
- *   <pkg>/.next/standalone/apps/web/.next/static/
- *   <pkg>/.next/standalone/node_modules/
- *   <pkg>/dist/prisma/schema.prisma              ← bundled from apps/server/prisma
- *   <pkg>/dist/prisma/migrations/**
- *   <pkg>/dist/prisma.config.ts                  ← passed via --config by dist/auto-migrate.js
- *   <pkg>/dist/scripts/monaco-editor.sh          ← $EDITOR for Ctrl+G (resolved by dist/server/routes/terminal.js)
- *   <pkg>/dist/docs/                             ← bundled from apps/docs/out (served on DOCS_PORT)
- *   <pkg>/dist/whisper-server/                   ← bundled from apps/whisper-server
- *   <pkg>/tsunagi-marketplace/plugins/tsunagi-plugin/.claude-plugin/plugin.json
+ * - Holds the single-instance lock and forwards SIGINT / SIGTERM / SIGHUP.
+ * - Runs the app of `next` (or `lastGood`) from ~/.tsunagi/versions/, or of
+ *   this package when it is newer (reinstalled by hand).
+ * - Runs the app in its own process group and kills what is left of the
+ *   group after the app exits.
+ * - Starts the app again when it exits with RESTART_EXIT_CODE.
+ * - When a version other than `lastGood` exits before `ready`, marks it broken,
+ *   restores the DB snapshot the app took, and starts `lastGood` again.
  */
-// ---------------------------------------------------------------------------
-// Braille-dots spinner
-// ---------------------------------------------------------------------------
-const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-function createSpinner(message) {
-    let i = 0;
-    // Write first frame immediately so it shows even during spawnSync/execSync blocking
-    process.stdout.write(`\r${SPINNER_FRAMES[0]} ${message}`);
-    i++;
-    const timer = setInterval(() => {
-        process.stdout.write(`\r${SPINNER_FRAMES[i % SPINNER_FRAMES.length]} ${message}`);
-        i++;
-    }, 80);
-    return {
-        stop() {
-            clearInterval(timer);
-            // Clear the spinner line
-            process.stdout.write('\r' + ' '.repeat(message.length + 4) + '\r');
-        },
-    };
-}
 if (process.platform !== 'darwin' && process.platform !== 'linux') {
     console.error(`[tsunagi] Unsupported platform: ${process.platform}`);
     console.error('[tsunagi] Tsunagi currently supports macOS and Linux only.');
     process.exit(1);
 }
-let spinner = createSpinner('Initializing...');
 acquireSingleInstanceLock();
-const DIST_DIR = path.dirname(fileURLToPath(import.meta.url));
-const PACKAGE_ROOT = path.resolve(DIST_DIR, '..');
-const AUTO_MIGRATE_JS = path.join(DIST_DIR, 'auto-migrate.js');
-const FASTIFY_ENTRY_JS = path.join(DIST_DIR, 'server', 'index.js');
-const NEXT_STANDALONE_ENTRY = path.join(PACKAGE_ROOT, '.next', 'standalone', 'apps', 'web', 'server.js');
-const DOCS_DIR = path.join(DIST_DIR, 'docs');
-const DOCS_PORT = 2793;
-const isDebug = !!process.env.TSUNAGI_DEBUG;
-const isDocker = fs.existsSync('/.dockerenv');
-// ---------------------------------------------------------------------------
-// ASCII art
-// ---------------------------------------------------------------------------
-const TSUNAGI_AA = `
-  __                          _
- / /____ __ _____  ___ ____ _(_)
-/ __(_-</ // / _ \\/ _ \`/ _ \`/ /
-\\__/___/\\_,_/_//_/\\_,_/\\_, /_/
-                      /___/
-`;
-// ---------------------------------------------------------------------------
-// Phase 1: Auto-migrate (synchronous child process)
-// ---------------------------------------------------------------------------
-function runAutoMigrate() {
-    if (!fs.existsSync(AUTO_MIGRATE_JS)) {
-        console.error(`[tsunagi] Missing build artifact: ${AUTO_MIGRATE_JS}`);
-        process.exit(1);
+const PACKAGE_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+function readPackageVersion(root) {
+    try {
+        const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8'));
+        return typeof pkg.version === 'string' ? pkg.version : null;
     }
-    const result = spawnSync(process.execPath, [AUTO_MIGRATE_JS], {
-        stdio: isDebug ? 'inherit' : ['inherit', 'pipe', 'pipe'],
-        cwd: PACKAGE_ROOT,
-    });
-    if (result.status !== 0) {
-        const stderr = result.stderr?.toString().trim();
-        if (stderr)
-            console.error(stderr);
-        console.error('[tsunagi] Database migration failed.');
-        process.exit(result.status ?? 1);
+    catch {
+        return null;
     }
-    // Display migration result (e.g. "1 migration applied.")
-    const stdout = result.stdout?.toString().trim();
-    if (stdout)
-        console.log(stdout);
 }
-runAutoMigrate();
-// ---------------------------------------------------------------------------
-// Phase 2: Plugin lifecycle
-// ---------------------------------------------------------------------------
-ensureCleanPluginState();
-// ---------------------------------------------------------------------------
-// Docs static file server
-// ---------------------------------------------------------------------------
-const MIME_TYPES = {
-    '.html': 'text/html; charset=utf-8',
-    '.css': 'text/css',
-    '.js': 'application/javascript',
-    '.json': 'application/json',
-    '.png': 'image/png',
-    '.jpg': 'image/jpeg',
-    '.svg': 'image/svg+xml',
-    '.ico': 'image/x-icon',
-    '.wasm': 'application/wasm',
-    '.woff': 'font/woff',
-    '.woff2': 'font/woff2',
-    '.ttf': 'font/ttf',
-    '.txt': 'text/plain',
-    '.xml': 'application/xml',
-};
-function startDocsServer() {
-    if (!fs.existsSync(DOCS_DIR))
-        return null;
-    const serveFile = (filePath, res) => {
-        const ext = path.extname(filePath);
-        const contentType = MIME_TYPES[ext] || 'application/octet-stream';
-        fs.readFile(filePath, (err, data) => {
-            if (err) {
-                res.writeHead(404).end();
-                return;
-            }
-            res.writeHead(200, { 'Content-Type': contentType });
-            res.end(data);
+const ownVersion = readPackageVersion(PACKAGE_ROOT) ?? '0.0.0';
+// npm でインストールされた tsunagi だけを自動更新する。
+// リポジトリから build して直接実行している場合（docker/compose.prd.yml 等）はこのパッケージだけを使う
+const useInstalledVersions = PACKAGE_ROOT.split(path.sep).includes('node_modules') &&
+    process.env.TSUNAGI_DISABLE_AUTO_UPDATE !== '1';
+function resolveApp(state) {
+    const own = { version: ownVersion, root: PACKAGE_ROOT };
+    if (!useInstalledVersions)
+        return own;
+    const broken = getBrokenVersions(state);
+    const installed = [state.next, state.lastGood].find((version) => typeof version === 'string' && !broken.includes(version) && isInstalled(version));
+    if (!installed)
+        return own;
+    // 手動で入れ直したこのパッケージの方が新しければ、そちらを使う
+    if (!broken.includes(own.version) && compareVersions(own.version, installed) >= 0)
+        return own;
+    return { version: installed, root: getPackageRootOf(installed) };
+}
+let current = null;
+let stopping = false;
+/** app のプロセスグループに残ったプロセスを止める */
+function killProcessGroup(pid) {
+    if (!pid)
+        return;
+    try {
+        process.kill(-pid, 'SIGKILL');
+    }
+    catch {
+        // グループに誰も残っていない
+    }
+}
+function runApp(app, options) {
+    return new Promise((resolve) => {
+        let ready = false;
+        const env = {
+            ...process.env,
+            TSUNAGI_ENTRY_PROTOCOL: String(ENTRY_PROTOCOL),
+            TSUNAGI_ENTRY_PACKAGE_ROOT: PACKAGE_ROOT,
+        };
+        if (useInstalledVersions)
+            env.TSUNAGI_AUTO_UPDATE = '1';
+        if (options.lastGood)
+            env.TSUNAGI_LAST_GOOD = options.lastGood;
+        if (options.restarted)
+            env.TSUNAGI_RESTARTED = '1';
+        // detached: app と子孫を独立したプロセスグループにし、終了後にまとめて止められるようにする。
+        // 端末の Ctrl+C は entry だけが受け、app には SIGTERM で伝える
+        const child = spawn(process.execPath, [path.join(app.root, 'dist', 'app.js')], {
+            stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
+            cwd: app.root,
+            env,
+            detached: true,
         });
-    };
-    const server = http.createServer((req, res) => {
-        let urlPath;
-        try {
-            urlPath = decodeURIComponent(new URL(req.url ?? '/', 'http://localhost').pathname);
-        }
-        catch {
-            res.writeHead(400).end();
-            return;
-        }
-        const filePath = path.resolve(DOCS_DIR, '.' + urlPath);
-        if (!filePath.startsWith(DOCS_DIR)) {
-            res.writeHead(403).end();
-            return;
-        }
-        fs.stat(filePath, (err, stat) => {
-            if (err) {
-                res.writeHead(404).end();
+        current = child;
+        child.on('message', (message) => {
+            if (message?.type !== 'ready' || ready)
                 return;
+            ready = true;
+            try {
+                updateEntryState((state) => ({
+                    ...state,
+                    lastGood: app.version,
+                    broken: getBrokenVersions(state).filter((version) => version !== app.version),
+                    snapshot: null,
+                }));
             }
-            if (stat.isDirectory()) {
-                if (!urlPath.endsWith('/')) {
-                    res.writeHead(301, { Location: urlPath + '/' }).end();
-                    return;
-                }
-                serveFile(path.join(filePath, 'index.html'), res);
-            }
-            else {
-                serveFile(filePath, res);
+            catch (error) {
+                console.error('[tsunagi] Failed to record the running version:', error);
             }
         });
+        child.on('error', (error) => {
+            console.error('[tsunagi] Failed to start the app:', error);
+        });
+        child.on('exit', (code, signal) => {
+            killProcessGroup(child.pid);
+            current = null;
+            resolve({ code: code ?? (signal ? 1 : 0), ready });
+        });
     });
-    server.listen(DOCS_PORT, '0.0.0.0');
-    return server;
 }
-// ---------------------------------------------------------------------------
-// Phase 3: Verify build artifacts & spawn servers
-// ---------------------------------------------------------------------------
-function verifyArtifact(p, label) {
-    if (!fs.existsSync(p)) {
-        console.error(`[tsunagi] Missing ${label}: ${p}`);
-        console.error('[tsunagi] The package appears to be incomplete. Please reinstall.');
-        process.exit(1);
+function stop() {
+    if (stopping) {
+        // 2回目の Ctrl+C: 待たずに止める
+        killProcessGroup(current?.pid);
+        process.exit(130);
     }
-}
-verifyArtifact(FASTIFY_ENTRY_JS, 'Fastify server artifact');
-verifyArtifact(NEXT_STANDALONE_ENTRY, 'Next.js standalone artifact');
-// Fastify が単一の公開ポート。Next.js は内部ポートで動かし Fastify からプロキシする。
-const PORT = process.env.PORT ?? '2791';
-const NEXT_PORT = '2792';
-// Fastify サーバー自身の待受ポートは TSUNAGI_SERVER_PORT で伝える（generic な PORT は上書きしない）。
-// PORT を直接上書きすると、ユーザーが Terminal で明示的に PORT=xxxx と指定していた場合でも
-// tsunagi 内部ターミナル側でその値と tsunagi 自身の値を区別できなくなるため。
-//
-// NODE_ENV は Fastify/Next 等が直接参照するため PORT と同じ専用キー方式が使えず、サーバー
-// プロセス自身には強制的に 'production' を渡す必要がある。上書きする前に外側 Terminal 由来の
-// 元の値（未設定なら undefined）を TSUNAGI_OUTER_NODE_ENV に退避し、tsunagi 内部ターミナル側
-// （apps/server/src/pty-manager.ts）で復元できるようにする。
-const outerNodeEnv = process.env.NODE_ENV;
-// サーバー側の更新確認（apps/server/src/lib/update-check.ts）に実行中のバージョンを伝える。
-function readPackageVersion() {
+    stopping = true;
+    if (!current)
+        process.exit(0);
     try {
-        const pkg = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT, 'package.json'), 'utf8'));
-        return typeof pkg.version === 'string' ? pkg.version : undefined;
+        current.kill('SIGTERM');
     }
     catch {
-        return undefined;
+        // 既に終了している
     }
 }
-const packageVersion = readPackageVersion();
-const fastifyChild = spawn(process.execPath, [FASTIFY_ENTRY_JS], {
-    stdio: ['inherit', 'pipe', 'pipe'],
-    cwd: PACKAGE_ROOT,
-    env: {
-        ...process.env,
-        NODE_ENV: 'production',
-        ...(outerNodeEnv !== undefined ? { TSUNAGI_OUTER_NODE_ENV: outerNodeEnv } : {}),
-        TSUNAGI_SERVER_PORT: PORT,
-        TSUNAGI_NEXT_PORT: NEXT_PORT,
-        ...(packageVersion ? { TSUNAGI_VERSION: packageVersion } : {}),
-    },
-});
-const nextChild = spawn(process.execPath, [NEXT_STANDALONE_ENTRY], {
-    stdio: ['inherit', 'pipe', 'pipe'],
-    cwd: path.dirname(NEXT_STANDALONE_ENTRY),
-    env: { ...process.env, PORT: NEXT_PORT, NODE_ENV: 'production', HOSTNAME: '0.0.0.0' },
-});
-const docsServer = startDocsServer();
-// ---------------------------------------------------------------------------
-// Child process output forwarding
-// ---------------------------------------------------------------------------
-fastifyChild.stdout?.on('data', (data) => {
-    if (isDebug)
-        process.stdout.write(data);
-});
-fastifyChild.stderr?.on('data', (data) => {
-    process.stderr.write(data);
-});
-nextChild.stdout?.on('data', (data) => {
-    if (isDebug)
-        process.stdout.write(data);
-});
-nextChild.stderr?.on('data', (data) => {
-    process.stderr.write(data);
+process.on('SIGINT', stop);
+process.on('SIGTERM', stop);
+process.on('SIGHUP', stop);
+process.on('uncaughtException', (error) => {
+    console.error('[tsunagi] Uncaught exception:', error);
+    killProcessGroup(current?.pid);
+    process.exit(1);
 });
-// ---------------------------------------------------------------------------
-// Ready detection via /health polling
-// ---------------------------------------------------------------------------
-const POLL_INTERVAL_MS = 300;
-function pollHealth(port) {
-    return new Promise((resolve) => {
-        const poll = () => {
-            const req = http.get(`http://localhost:${port}/health`, (res) => {
-                if (res.statusCode === 200) {
-                    res.resume();
-                    resolve();
-                }
-                else {
-                    res.resume();
-                    setTimeout(poll, POLL_INTERVAL_MS);
-                }
-            });
-            req.on('error', () => {
-                setTimeout(poll, POLL_INTERVAL_MS);
-            });
-        };
-        poll();
+function setBroken(version, broken) {
+    updateEntryState((state) => {
+        const others = getBrokenVersions(state).filter((v) => v !== version);
+        return { ...state, broken: broken ? [...others, version] : others };
     });
 }
-// Fastify(PORT) と Next(NEXT_PORT) は各々 /health を持つ。各プロセスを直接叩く。
-Promise.all([pollHealth(Number(PORT)), pollHealth(Number(NEXT_PORT))]).then(() => {
-    spinner.stop();
-    console.log(TSUNAGI_AA);
-    const url = `http://localhost:${PORT}`;
-    if (!isDocker) {
-        // macOS / Linux / WSL（Windows 側ブラウザ）の差異は open パッケージが吸収する。
-        // ブラウザを開けなくてもサーバーは継続する（URL は下で案内する）
-        openBrowser(url).catch(() => { });
-    }
-    console.log(`Open ${url}`);
-    if (docsServer) {
-        console.log(`Docs http://localhost:${DOCS_PORT}`);
-    }
-});
-// ---------------------------------------------------------------------------
-// Shutdown
-// ---------------------------------------------------------------------------
-let shuttingDown = false;
-function shutdown(code) {
-    if (shuttingDown)
-        return;
-    shuttingDown = true;
-    spinner.stop();
-    const cleanupSpinner = createSpinner('Cleaning up...');
-    for (const child of [fastifyChild, nextChild]) {
-        if (child && !child.killed && child.exitCode === null) {
-            try {
-                child.kill('SIGTERM');
-            }
-            catch {
-                // ignore
+async function main() {
+    let restarted = false;
+    // ロールバックの原因になったバージョン。戻した版も起動できなければ環境側の問題なので記録を取り消す
+    let rolledBackFrom = null;
+    for (;;) {
+        const state = readEntryState();
+        const lastGood = typeof state.lastGood === 'string' ? state.lastGood : null;
+        const app = resolveApp(state);
+        const result = await runApp(app, { restarted, lastGood });
+        if (stopping)
+            process.exit(0);
+        if (result.ready) {
+            rolledBackFrom = null;
+        }
+        else if (rolledBackFrom) {
+            setBroken(rolledBackFrom, false);
+            process.exit(result.code);
+        }
+        else if (lastGood && app.version !== lastGood) {
+            const { snapshot } = readEntryState();
+            setBroken(app.version, true);
+            if (resolveApp(readEntryState()).version !== app.version) {
+                console.error(`[tsunagi] v${app.version} failed to start (code ${result.code}). Rolling back to v${lastGood}.`);
+                if (snapshot?.version === app.version)
+                    restoreSnapshot(snapshot);
+                updateEntryState((s) => ({ ...s, snapshot: null }));
+                rolledBackFrom = app.version;
+                continue;
             }
+            // 戻せる版がない
+            setBroken(app.version, false);
+        }
+        if (result.code === RESTART_EXIT_CODE) {
+            restarted = true;
+            continue;
         }
+        process.exit(result.code);
     }
-    docsServer?.close();
-    cleanupPluginState();
-    cleanupSpinner.stop();
-    process.exit(code);
 }
-process.on('SIGINT', () => shutdown(0));
-process.on('SIGTERM', () => shutdown(0));
-process.on('exit', () => {
-    if (!shuttingDown)
-        cleanupPluginState();
-});
-fastifyChild.on('exit', (code) => {
-    if (!shuttingDown) {
-        console.error(`[tsunagi] Fastify server exited unexpectedly (code ${code})`);
-        shutdown(code ?? 1);
-    }
-});
-nextChild.on('exit', (code) => {
-    if (!shuttingDown) {
-        console.error(`[tsunagi] Next.js server exited unexpectedly (code ${code})`);
-        shutdown(code ?? 1);
-    }
-});
+void main();

package/dist/plugin-lifecycle.d.ts

@@ -1,14 +1,13 @@
+/** PTY の CLAUDE_CODE_PLUGIN_DIRS に渡すプラグインのディレクトリ（絶対パス） */
+export declare function getPluginDir(): string;
 /**
- * Ensure a clean plugin state by removing any pre-existing tsunagi plugin /
- * marketplace registrations and then installing fresh copies.
- *
- * Exits the process with code 1 on install failure.
- *
- * @returns `'clean'` if orphaned state was cleaned up before install,
- *          `'fresh'` if no prior state existed.
+ * Exits the process with code 1 if the `claude` CLI is missing or too old to
+ * load plugins from `CLAUDE_CODE_PLUGIN_DIRS`.
  */
-export declare function ensureCleanPluginState(): 'clean' | 'fresh';
+export declare function assertClaudeSupportsPluginDirs(): void;
 /**
- * Best-effort cleanup. Called on process shutdown. Never throws.
+ * Remove the user-scope plugin / marketplace registered by older tsunagi
+ * versions. Runs once; a marker file in the state dir records completion.
+ * Never throws and never blocks startup on failure.
  */
-export declare function cleanupPluginState(): void;
+export declare function removeLegacyPluginInstall(): void;