@minimalcorp/tsunagi 0.1.18 → 0.1.19

package/.next/standalone/apps/web/.next/server/server-reference-manifest.json

@@ -1,5 +1,5 @@
 {
   "node": {},
   "edge": {},
-  "encryptionKey": "CiPF0BLW1nTeCp390Muw9C90MmM+OqybJoNDZJEzT/A="
+  "encryptionKey": "hLX1i/xTvsAKPbjekhoepwWIqzLmTgdTPSmlhVAOxGs="
 }

package/dist/server/routes/terminal.js

@@ -3,6 +3,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { ptyManager } from '../pty-manager.js';
 import { prisma } from '../lib/db.js';
+import { getEnv } from '../lib/repositories/environment.js';
 // サーバーはプロジェクトルートから起動されるため process.cwd() でルートを取得
 const TSUNAGI_EDITOR_PATH = path.resolve(process.cwd(), 'scripts/monaco-editor.sh');
 // Fastify(API) の公開ポート。index.ts と同じ既定値。monaco-editor.sh など PTY 内の
@@ -199,21 +200,22 @@ export async function terminalRoutes(fastify) {
             return reply.status(200).send({ sessionId, reused: true });
         }
         try {
-            // DBからglobal環境変数を取得（有効なもののみ）
-            const globalEnv = {};
+            // sessionId(=tab_id) から Task(owner/repo) を解決し、repo スコープまで階層マージした
+            // 環境変数を取得する（global → owner → repo、後勝ちで上書き）。
+            // Plannerタブ等、Taskに紐づかないタブは Tab レコードが存在しないため global のみになる。
+            let dbEnv = {};
             try {
-                const globalEnvVars = await prisma.environmentVariable.findMany({
-                    where: { scope: 'global', enabled: true },
-                });
-                globalEnvVars.forEach((e) => {
-                    globalEnv[e.key] = e.value;
+                const tab = await prisma.tab.findUnique({
+                    where: { tabId: sessionId },
+                    include: { task: true },
                 });
-                fastify.log.info({ count: globalEnvVars.length }, 'Loaded global env vars');
+                dbEnv = tab ? await getEnv('repo', tab.task.owner, tab.task.repo) : await getEnv('global');
+                fastify.log.info({ count: Object.keys(dbEnv).length, owner: tab?.task.owner, repo: tab?.task.repo }, 'Loaded env vars');
             }
             catch (err) {
-                fastify.log.warn({ err }, 'Failed to load global env vars');
+                fastify.log.warn({ err }, 'Failed to load env vars');
             }
-            // 優先順位: リクエストで渡されたenv > DBのglobal env > tsunagi独自のEDITOR設定
+            // 優先順位: リクエストで渡されたenv > DB env(global/owner/repo) > tsunagi独自のEDITOR設定
             // tsunagi-editor.sh をデフォルトにすることで Ctrl+G が Monaco Modal を開く。
             // DB / リクエストで EDITOR が明示設定されている場合はそちらが優先される。
             const tsunagiDefaultEnv = {
@@ -223,7 +225,7 @@ export async function terminalRoutes(fastify) {
                 // ホストなので localhost。単一ポート化で API は SERVER_PORT(既定 2791)。
                 TSUNAGI_API_BASE: `http://localhost:${SERVER_PORT}`,
             };
-            const mergedEnv = { ...tsunagiDefaultEnv, ...globalEnv, ...env };
+            const mergedEnv = { ...tsunagiDefaultEnv, ...dbEnv, ...env };
             const session = ptyManager.createSession(sessionId, workingDir, mergedEnv);
             // コマンドが指定されていればPTY起動後にシェルへ書き込む
             if (command) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@minimalcorp/tsunagi",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@minimalcorp/tsunagi",
-      "version": "0.1.18",
+      "version": "0.1.19",
       "license": "SEE LICENSE IN LICENSE",
       "os": [
         "darwin",
@@ -1034,9 +1034,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "26.0.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.0.1.tgz",
-      "integrity": "sha512-fc3KiUoBt6kie0N9bIW3E47vZsuaMf0PM2AaUpLCLT0s/LvX1nxAim6Fc049cNxODPpGm6qRAuUOB86SkRuPQw==",
+      "version": "26.1.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.0.tgz",
+      "integrity": "sha512-O0A1G3xPGy4w7AgQdAQYUlQ+BKk2Oovw8eRpofyp5KdBZULnbe+WqaOVNrm705SHphCiG4XHsACrSmPu1f+Kgw==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~8.3.0"
@@ -1826,9 +1826,9 @@
       }
     },
     "node_modules/fast-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz",
+      "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==",
       "funding": [
         {
           "type": "github",
@@ -1842,9 +1842,9 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/fastify": {
-      "version": "5.8.5",
-      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.8.5.tgz",
-      "integrity": "sha512-Yqptv59pQzPgQUSIm87hMqHJmdkb1+GPxdE6vW6FRyVE9G86mt7rOghitiU4JHRaTyDUk9pfeKmDeu70lAwM4Q==",
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/fastify/-/fastify-5.9.0.tgz",
+      "integrity": "sha512-VMS5lE0zj+MZlJpQa3Qv5iGjfun0H2N7VRgoBwpcTNQ2bdIQpv7fDpb+HGteGbicBsGkzGS+X+hdx9mmrfWuHQ==",
       "funding": [
         {
           "type": "github",
@@ -1864,7 +1864,7 @@
         "abstract-logging": "^2.0.1",
         "avvio": "^9.0.0",
         "fast-json-stringify": "^6.0.0",
-        "find-my-way": "^9.0.0",
+        "find-my-way": "^9.6.0",
         "light-my-request": "^6.0.0",
         "pino": "^9.14.0 || ^10.1.0",
         "process-warning": "^5.0.0",

package/package.json

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