@akiojin/gwt 2.13.0 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.ja.md +41 -0
- package/README.md +38 -0
- package/dist/claude.d.ts.map +1 -1
- package/dist/claude.js +17 -11
- package/dist/claude.js.map +1 -1
- package/dist/cli/ui/components/App.d.ts +0 -6
- package/dist/cli/ui/components/App.d.ts.map +1 -1
- package/dist/cli/ui/components/App.js +27 -88
- package/dist/cli/ui/components/App.js.map +1 -1
- package/dist/cli/ui/components/common/Select.js +2 -2
- package/dist/cli/ui/components/common/Select.js.map +1 -1
- package/dist/cli/ui/components/screens/BranchListScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/BranchListScreen.js.map +1 -1
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js +3 -3
- package/dist/cli/ui/components/screens/BranchQuickStartScreen.js.map +1 -1
- package/dist/cli/ui/utils/continueSession.d.ts.map +1 -1
- package/dist/cli/ui/utils/continueSession.js +1 -1
- package/dist/cli/ui/utils/continueSession.js.map +1 -1
- package/dist/client/assets/index-DsDNCy5f.css +1 -0
- package/dist/client/assets/index-f5D2XwDh.js +72 -0
- package/dist/client/index.html +2 -2
- package/dist/codex.d.ts.map +1 -1
- package/dist/codex.js +21 -11
- package/dist/codex.js.map +1 -1
- package/dist/config/builtin-tools.d.ts.map +1 -1
- package/dist/config/builtin-tools.js +3 -2
- package/dist/config/builtin-tools.js.map +1 -1
- package/dist/config/shared-env.d.ts +41 -0
- package/dist/config/shared-env.d.ts.map +1 -0
- package/dist/config/shared-env.js +114 -0
- package/dist/config/shared-env.js.map +1 -0
- package/dist/gemini.d.ts.map +1 -1
- package/dist/gemini.js +20 -17
- package/dist/gemini.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +13 -8
- package/dist/index.js.map +1 -1
- package/dist/logging/logger.d.ts.map +1 -1
- package/dist/logging/logger.js +4 -1
- package/dist/logging/logger.js.map +1 -1
- package/dist/qwen.d.ts.map +1 -1
- package/dist/qwen.js +15 -11
- package/dist/qwen.js.map +1 -1
- package/dist/services/aiToolResolver.d.ts +41 -0
- package/dist/services/aiToolResolver.d.ts.map +1 -0
- package/dist/services/aiToolResolver.js +194 -0
- package/dist/services/aiToolResolver.js.map +1 -0
- package/dist/services/customToolResolver.d.ts +10 -0
- package/dist/services/customToolResolver.d.ts.map +1 -0
- package/dist/services/customToolResolver.js +71 -0
- package/dist/services/customToolResolver.js.map +1 -0
- package/dist/shared/aiToolConstants.d.ts +9 -0
- package/dist/shared/aiToolConstants.d.ts.map +1 -0
- package/dist/shared/aiToolConstants.js +29 -0
- package/dist/shared/aiToolConstants.js.map +1 -0
- package/dist/types/tools.d.ts +12 -0
- package/dist/types/tools.d.ts.map +1 -1
- package/dist/utils/prompt.d.ts.map +1 -1
- package/dist/utils/prompt.js.map +1 -1
- package/dist/utils/session.d.ts.map +1 -1
- package/dist/utils/session.js +15 -6
- package/dist/utils/session.js.map +1 -1
- package/dist/utils/terminal.d.ts +12 -3
- package/dist/utils/terminal.d.ts.map +1 -1
- package/dist/utils/terminal.js +5 -34
- package/dist/utils/terminal.js.map +1 -1
- package/dist/utils/webui.d.ts +8 -0
- package/dist/utils/webui.d.ts.map +1 -0
- package/dist/utils/webui.js +35 -0
- package/dist/utils/webui.js.map +1 -0
- package/dist/web/client/src/components/AIToolLaunchModal.d.ts +9 -0
- package/dist/web/client/src/components/AIToolLaunchModal.d.ts.map +1 -0
- package/dist/web/client/src/components/AIToolLaunchModal.js +363 -0
- package/dist/web/client/src/components/AIToolLaunchModal.js.map +1 -0
- package/dist/web/client/src/components/BranchGraph.d.ts.map +1 -1
- package/dist/web/client/src/components/BranchGraph.js +46 -49
- package/dist/web/client/src/components/BranchGraph.js.map +1 -1
- package/dist/web/client/src/components/CustomToolForm.d.ts +23 -0
- package/dist/web/client/src/components/CustomToolForm.d.ts.map +1 -0
- package/dist/web/client/src/components/CustomToolForm.js +209 -0
- package/dist/web/client/src/components/CustomToolForm.js.map +1 -0
- package/dist/web/client/src/components/CustomToolList.d.ts +10 -0
- package/dist/web/client/src/components/CustomToolList.d.ts.map +1 -0
- package/dist/web/client/src/components/CustomToolList.js +57 -0
- package/dist/web/client/src/components/CustomToolList.js.map +1 -0
- package/dist/web/client/src/components/EnvEditor.d.ts.map +1 -1
- package/dist/web/client/src/components/EnvEditor.js +33 -26
- package/dist/web/client/src/components/EnvEditor.js.map +1 -1
- package/dist/web/client/src/components/EnvironmentEditor.d.ts +17 -0
- package/dist/web/client/src/components/EnvironmentEditor.d.ts.map +1 -0
- package/dist/web/client/src/components/EnvironmentEditor.js +22 -0
- package/dist/web/client/src/components/EnvironmentEditor.js.map +1 -0
- package/dist/web/client/src/components/Terminal.d.ts.map +1 -1
- package/dist/web/client/src/components/Terminal.js +10 -3
- package/dist/web/client/src/components/Terminal.js.map +1 -1
- package/dist/web/client/src/components/branch-detail/BranchInfoCards.d.ts +10 -0
- package/dist/web/client/src/components/branch-detail/BranchInfoCards.d.ts.map +1 -0
- package/dist/web/client/src/components/branch-detail/BranchInfoCards.js +104 -0
- package/dist/web/client/src/components/branch-detail/BranchInfoCards.js.map +1 -0
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.d.ts +22 -0
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.d.ts.map +1 -0
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.js +79 -0
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.js.map +1 -0
- package/dist/web/client/src/components/branch-detail/TerminalPanel.d.ts +11 -0
- package/dist/web/client/src/components/branch-detail/TerminalPanel.d.ts.map +1 -0
- package/dist/web/client/src/components/branch-detail/TerminalPanel.js +32 -0
- package/dist/web/client/src/components/branch-detail/TerminalPanel.js.map +1 -0
- package/dist/web/client/src/components/branch-detail/ToolLauncher.d.ts +40 -0
- package/dist/web/client/src/components/branch-detail/ToolLauncher.d.ts.map +1 -0
- package/dist/web/client/src/components/branch-detail/ToolLauncher.js +147 -0
- package/dist/web/client/src/components/branch-detail/ToolLauncher.js.map +1 -0
- package/dist/web/client/src/components/branch-detail/index.d.ts +5 -0
- package/dist/web/client/src/components/branch-detail/index.d.ts.map +1 -0
- package/dist/web/client/src/components/branch-detail/index.js +5 -0
- package/dist/web/client/src/components/branch-detail/index.js.map +1 -0
- package/dist/web/client/src/components/common/BranchCard.d.ts +17 -0
- package/dist/web/client/src/components/common/BranchCard.d.ts.map +1 -0
- package/dist/web/client/src/components/common/BranchCard.js +36 -0
- package/dist/web/client/src/components/common/BranchCard.js.map +1 -0
- package/dist/web/client/src/components/common/MetricCard.d.ts +10 -0
- package/dist/web/client/src/components/common/MetricCard.d.ts.map +1 -0
- package/dist/web/client/src/components/common/MetricCard.js +10 -0
- package/dist/web/client/src/components/common/MetricCard.js.map +1 -0
- package/dist/web/client/src/components/common/PageHeader.d.ts +12 -0
- package/dist/web/client/src/components/common/PageHeader.d.ts.map +1 -0
- package/dist/web/client/src/components/common/PageHeader.js +14 -0
- package/dist/web/client/src/components/common/PageHeader.js.map +1 -0
- package/dist/web/client/src/components/common/SearchInput.d.ts +14 -0
- package/dist/web/client/src/components/common/SearchInput.d.ts.map +1 -0
- package/dist/web/client/src/components/common/SearchInput.js +15 -0
- package/dist/web/client/src/components/common/SearchInput.js.map +1 -0
- package/dist/web/client/src/components/common/StatusBadge.d.ts +10 -0
- package/dist/web/client/src/components/common/StatusBadge.d.ts.map +1 -0
- package/dist/web/client/src/components/common/StatusBadge.js +15 -0
- package/dist/web/client/src/components/common/StatusBadge.js.map +1 -0
- package/dist/web/client/src/components/common/index.d.ts +6 -0
- package/dist/web/client/src/components/common/index.d.ts.map +1 -0
- package/dist/web/client/src/components/common/index.js +6 -0
- package/dist/web/client/src/components/common/index.js.map +1 -0
- package/dist/web/client/src/components/ui/alert.d.ts +9 -0
- package/dist/web/client/src/components/ui/alert.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/alert.js +25 -0
- package/dist/web/client/src/components/ui/alert.js.map +1 -0
- package/dist/web/client/src/components/ui/badge.d.ts +10 -0
- package/dist/web/client/src/components/ui/badge.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/badge.js +25 -0
- package/dist/web/client/src/components/ui/badge.js.map +1 -0
- package/dist/web/client/src/components/ui/button.d.ts +12 -0
- package/dist/web/client/src/components/ui/button.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/button.js +33 -0
- package/dist/web/client/src/components/ui/button.js.map +1 -0
- package/dist/web/client/src/components/ui/card.d.ts +9 -0
- package/dist/web/client/src/components/ui/card.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/card.js +16 -0
- package/dist/web/client/src/components/ui/card.js.map +1 -0
- package/dist/web/client/src/components/ui/index.d.ts +8 -0
- package/dist/web/client/src/components/ui/index.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/index.js +8 -0
- package/dist/web/client/src/components/ui/index.js.map +1 -0
- package/dist/web/client/src/components/ui/input.d.ts +4 -0
- package/dist/web/client/src/components/ui/input.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/input.js +8 -0
- package/dist/web/client/src/components/ui/input.js.map +1 -0
- package/dist/web/client/src/components/ui/select.d.ts +14 -0
- package/dist/web/client/src/components/ui/select.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/select.js +39 -0
- package/dist/web/client/src/components/ui/select.js.map +1 -0
- package/dist/web/client/src/components/ui/table.d.ts +11 -0
- package/dist/web/client/src/components/ui/table.d.ts.map +1 -0
- package/dist/web/client/src/components/ui/table.js +21 -0
- package/dist/web/client/src/components/ui/table.js.map +1 -0
- package/dist/web/client/src/hooks/useSessions.d.ts.map +1 -1
- package/dist/web/client/src/hooks/useSessions.js +6 -1
- package/dist/web/client/src/hooks/useSessions.js.map +1 -1
- package/dist/web/client/src/lib/utils.d.ts +7 -0
- package/dist/web/client/src/lib/utils.d.ts.map +1 -0
- package/dist/web/client/src/lib/utils.js +10 -0
- package/dist/web/client/src/lib/utils.js.map +1 -0
- package/dist/web/client/src/lib/websocket.d.ts +7 -0
- package/dist/web/client/src/lib/websocket.d.ts.map +1 -1
- package/dist/web/client/src/lib/websocket.js +44 -0
- package/dist/web/client/src/lib/websocket.js.map +1 -1
- package/dist/web/client/src/pages/BranchDetailPage.d.ts.map +1 -1
- package/dist/web/client/src/pages/BranchDetailPage.js +125 -376
- package/dist/web/client/src/pages/BranchDetailPage.js.map +1 -1
- package/dist/web/client/src/pages/BranchListPage.d.ts.map +1 -1
- package/dist/web/client/src/pages/BranchListPage.js +89 -127
- package/dist/web/client/src/pages/BranchListPage.js.map +1 -1
- package/dist/web/client/src/pages/ConfigManagementPage.d.ts.map +1 -1
- package/dist/web/client/src/pages/ConfigManagementPage.js +46 -41
- package/dist/web/client/src/pages/ConfigManagementPage.js.map +1 -1
- package/dist/web/client/src/pages/ConfigPage.d.ts +3 -0
- package/dist/web/client/src/pages/ConfigPage.d.ts.map +1 -0
- package/dist/web/client/src/pages/ConfigPage.js +216 -0
- package/dist/web/client/src/pages/ConfigPage.js.map +1 -0
- package/dist/web/client/vite.config.d.ts.map +1 -1
- package/dist/web/client/vite.config.js +8 -1
- package/dist/web/client/vite.config.js.map +1 -1
- package/dist/web/server/index.d.ts +24 -2
- package/dist/web/server/index.d.ts.map +1 -1
- package/dist/web/server/index.js +46 -15
- package/dist/web/server/index.js.map +1 -1
- package/dist/web/server/pty/manager.d.ts +12 -10
- package/dist/web/server/pty/manager.d.ts.map +1 -1
- package/dist/web/server/pty/manager.js +76 -43
- package/dist/web/server/pty/manager.js.map +1 -1
- package/dist/web/server/routes/sessions.d.ts.map +1 -1
- package/dist/web/server/routes/sessions.js +35 -2
- package/dist/web/server/routes/sessions.js.map +1 -1
- package/dist/web/server/routes/worktrees.js +2 -2
- package/dist/web/server/routes/worktrees.js.map +1 -1
- package/dist/web/server/services/worktrees.d.ts.map +1 -1
- package/dist/web/server/services/worktrees.js +7 -1
- package/dist/web/server/services/worktrees.js.map +1 -1
- package/dist/web/server/tray.d.ts +25 -0
- package/dist/web/server/tray.d.ts.map +1 -0
- package/dist/web/server/tray.js +98 -0
- package/dist/web/server/tray.js.map +1 -0
- package/dist/web/server/websocket/handler.d.ts +18 -2
- package/dist/web/server/websocket/handler.d.ts.map +1 -1
- package/dist/web/server/websocket/handler.js +82 -9
- package/dist/web/server/websocket/handler.js.map +1 -1
- package/package.json +15 -2
- package/src/claude.ts +26 -15
- package/src/cli/ui/__tests__/components/App.protected-branch.test.tsx +1 -1
- package/src/cli/ui/__tests__/components/common/Select.test.tsx +11 -0
- package/src/cli/ui/__tests__/components/screens/BranchListScreen.test.tsx +3 -1
- package/src/cli/ui/__tests__/components/screens/BranchQuickStartScreen.test.tsx +4 -4
- package/src/cli/ui/components/App.tsx +33 -133
- package/src/cli/ui/components/common/Select.tsx +2 -2
- package/src/cli/ui/components/screens/BranchListScreen.tsx +28 -21
- package/src/cli/ui/components/screens/BranchQuickStartScreen.tsx +41 -46
- package/src/cli/ui/utils/continueSession.ts +1 -7
- package/src/codex.ts +31 -22
- package/src/config/builtin-tools.ts +6 -2
- package/src/config/shared-env.ts +139 -0
- package/src/gemini.ts +35 -22
- package/src/index.ts +13 -8
- package/src/logging/logger.ts +5 -2
- package/src/qwen.ts +28 -19
- package/src/services/aiToolResolver.ts +276 -0
- package/src/services/customToolResolver.ts +98 -0
- package/src/shared/aiToolConstants.ts +30 -0
- package/src/trayicon.d.ts +30 -0
- package/src/types/tools.ts +15 -0
- package/src/utils/prompt.ts +15 -9
- package/src/utils/session.ts +80 -26
- package/src/utils/terminal.ts +11 -41
- package/src/utils/webui.ts +43 -0
- package/src/web/client/components.json +21 -0
- package/src/web/client/src/components/AIToolLaunchModal.tsx +575 -0
- package/src/web/client/src/components/BranchGraph.tsx +95 -75
- package/src/web/client/src/components/CustomToolForm.tsx +386 -0
- package/src/web/client/src/components/CustomToolList.tsx +119 -0
- package/src/web/client/src/components/EnvEditor.tsx +91 -81
- package/src/web/client/src/components/EnvironmentEditor.tsx +97 -0
- package/src/web/client/src/components/Terminal.tsx +11 -3
- package/src/web/client/src/components/branch-detail/BranchInfoCards.tsx +179 -0
- package/src/web/client/src/components/branch-detail/SessionHistoryTable.tsx +181 -0
- package/src/web/client/src/components/branch-detail/TerminalPanel.tsx +92 -0
- package/src/web/client/src/components/branch-detail/ToolLauncher.tsx +327 -0
- package/src/web/client/src/components/branch-detail/index.ts +4 -0
- package/src/web/client/src/components/common/BranchCard.tsx +117 -0
- package/src/web/client/src/components/common/MetricCard.tsx +22 -0
- package/src/web/client/src/components/common/PageHeader.tsx +44 -0
- package/src/web/client/src/components/common/SearchInput.tsx +40 -0
- package/src/web/client/src/components/common/StatusBadge.tsx +37 -0
- package/src/web/client/src/components/common/index.ts +5 -0
- package/src/web/client/src/components/ui/alert.tsx +63 -0
- package/src/web/client/src/components/ui/badge.tsx +44 -0
- package/src/web/client/src/components/ui/button.tsx +57 -0
- package/src/web/client/src/components/ui/card.tsx +82 -0
- package/src/web/client/src/components/ui/index.ts +32 -0
- package/src/web/client/src/components/ui/input.tsx +21 -0
- package/src/web/client/src/components/ui/select.tsx +156 -0
- package/src/web/client/src/components/ui/table.tsx +119 -0
- package/src/web/client/src/hooks/useSessions.ts +10 -1
- package/src/web/client/src/index.css +46 -816
- package/src/web/client/src/lib/utils.ts +10 -0
- package/src/web/client/src/lib/websocket.ts +48 -1
- package/src/web/client/src/pages/BranchDetailPage.tsx +247 -723
- package/src/web/client/src/pages/BranchListPage.tsx +190 -236
- package/src/web/client/src/pages/ConfigManagementPage.tsx +94 -76
- package/src/web/client/src/pages/ConfigPage.tsx +362 -0
- package/src/web/client/vite.config.ts +8 -1
- package/src/web/server/index.ts +72 -15
- package/src/web/server/pty/manager.ts +128 -55
- package/src/web/server/routes/sessions.ts +59 -7
- package/src/web/server/routes/worktrees.ts +3 -3
- package/src/web/server/services/worktrees.ts +12 -4
- package/src/web/server/tray.ts +120 -0
- package/src/web/server/websocket/handler.ts +119 -13
- package/dist/client/assets/index-DeNwPosA.css +0 -1
- package/dist/client/assets/index-Dl798X5w.js +0 -32
|
@@ -0,0 +1,216 @@
|
|
|
1
|
+
import React, { useEffect, useMemo, useState } from "react";
|
|
2
|
+
import { Link } from "react-router-dom";
|
|
3
|
+
import { useConfig, useUpdateConfig } from "../hooks/useConfig";
|
|
4
|
+
import { CustomToolList } from "../components/CustomToolList";
|
|
5
|
+
import { CustomToolForm, } from "../components/CustomToolForm";
|
|
6
|
+
import { EnvironmentEditor, } from "../components/EnvironmentEditor";
|
|
7
|
+
import { PageHeader } from "@/components/common/PageHeader";
|
|
8
|
+
import { Button } from "@/components/ui/button";
|
|
9
|
+
import { Card, CardHeader, CardContent } from "@/components/ui/card";
|
|
10
|
+
import { Alert, AlertDescription } from "@/components/ui/alert";
|
|
11
|
+
const ENV_KEY_REGEX = /^[A-Z0-9_]+$/;
|
|
12
|
+
const ENV_KEY_MAX = 100;
|
|
13
|
+
const ENV_VALUE_MAX = 500;
|
|
14
|
+
export function ConfigPage() {
|
|
15
|
+
const { data, isLoading, error } = useConfig();
|
|
16
|
+
const updateConfig = useUpdateConfig();
|
|
17
|
+
const [tools, setTools] = useState([]);
|
|
18
|
+
const [editingTool, setEditingTool] = useState(undefined);
|
|
19
|
+
const [banner, setBanner] = useState(null);
|
|
20
|
+
const [isCreating, setIsCreating] = useState(false);
|
|
21
|
+
const [envEntries, setEnvEntries] = useState([]);
|
|
22
|
+
useEffect(() => {
|
|
23
|
+
if (data?.tools)
|
|
24
|
+
setTools(data.tools);
|
|
25
|
+
if (data)
|
|
26
|
+
setEnvEntries(entriesFromVariables(data.env));
|
|
27
|
+
}, [data]);
|
|
28
|
+
const sortedTools = useMemo(() => {
|
|
29
|
+
return [...tools].sort((a, b) => a.displayName.localeCompare(b.displayName, "ja"));
|
|
30
|
+
}, [tools]);
|
|
31
|
+
const handleEdit = (tool) => {
|
|
32
|
+
setEditingTool(tool);
|
|
33
|
+
setIsCreating(false);
|
|
34
|
+
};
|
|
35
|
+
const handleDelete = (tool) => {
|
|
36
|
+
if (!window.confirm(`${tool.displayName} を削除しますか?`))
|
|
37
|
+
return;
|
|
38
|
+
const next = tools.filter((t) => t.id !== tool.id);
|
|
39
|
+
persistConfig(next, envEntries, `${tool.displayName} を削除しました。`);
|
|
40
|
+
};
|
|
41
|
+
const handleCreate = () => {
|
|
42
|
+
setEditingTool(undefined);
|
|
43
|
+
setIsCreating(true);
|
|
44
|
+
};
|
|
45
|
+
const handleFormSubmit = (value) => {
|
|
46
|
+
const now = new Date().toISOString();
|
|
47
|
+
const existing = tools.find((tool) => tool.id === value.id);
|
|
48
|
+
const nextTool = {
|
|
49
|
+
id: value.id,
|
|
50
|
+
displayName: value.displayName,
|
|
51
|
+
icon: value.icon ?? null,
|
|
52
|
+
description: value.description ?? null,
|
|
53
|
+
executionType: value.executionType,
|
|
54
|
+
command: value.command,
|
|
55
|
+
defaultArgs: value.defaultArgs ?? null,
|
|
56
|
+
modeArgs: {
|
|
57
|
+
normal: value.modeArgs.normal ?? [],
|
|
58
|
+
continue: value.modeArgs.continue ?? [],
|
|
59
|
+
resume: value.modeArgs.resume ?? [],
|
|
60
|
+
},
|
|
61
|
+
permissionSkipArgs: value.permissionSkipArgs ?? null,
|
|
62
|
+
env: value.env ?? null,
|
|
63
|
+
createdAt: existing?.createdAt ?? now,
|
|
64
|
+
updatedAt: now,
|
|
65
|
+
};
|
|
66
|
+
const nextList = existing
|
|
67
|
+
? tools.map((tool) => (tool.id === nextTool.id ? nextTool : tool))
|
|
68
|
+
: [...tools, nextTool];
|
|
69
|
+
persistConfig(nextList, envEntries, `${nextTool.displayName} を保存しました。`);
|
|
70
|
+
};
|
|
71
|
+
const persistConfig = (nextTools, nextEnvEntries, successMessage, options) => {
|
|
72
|
+
let envPayload;
|
|
73
|
+
try {
|
|
74
|
+
envPayload = buildEnvVariables(nextEnvEntries);
|
|
75
|
+
}
|
|
76
|
+
catch (err) {
|
|
77
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
78
|
+
setBanner({ type: "error", message });
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const nextVersion = data?.version ?? "1.0.0";
|
|
82
|
+
updateConfig
|
|
83
|
+
.mutateAsync({ version: nextVersion, tools: nextTools, env: envPayload })
|
|
84
|
+
.then((response) => {
|
|
85
|
+
setTools(response.tools);
|
|
86
|
+
setEnvEntries(entriesFromVariables(response.env));
|
|
87
|
+
setBanner({ type: "success", message: successMessage });
|
|
88
|
+
if (options?.resetToolForm ?? true) {
|
|
89
|
+
setEditingTool(undefined);
|
|
90
|
+
setIsCreating(false);
|
|
91
|
+
}
|
|
92
|
+
})
|
|
93
|
+
.catch((err) => {
|
|
94
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
95
|
+
setBanner({ type: "error", message });
|
|
96
|
+
});
|
|
97
|
+
};
|
|
98
|
+
const handleEnvEntryChange = (id, field, value) => {
|
|
99
|
+
setEnvEntries((prev) => prev.map((entry) => entry.id === id
|
|
100
|
+
? {
|
|
101
|
+
...entry,
|
|
102
|
+
[field]: field === "key" ? sanitizeEnvKey(value) : value,
|
|
103
|
+
}
|
|
104
|
+
: entry));
|
|
105
|
+
};
|
|
106
|
+
const handleEnvAdd = () => setEnvEntries((prev) => [...prev, createEnvEntry()]);
|
|
107
|
+
const handleEnvRemove = (id) => setEnvEntries((prev) => prev.filter((e) => e.id !== id));
|
|
108
|
+
const handleEnvSave = () => persistConfig(tools, envEntries, "環境変数を保存しました。", {
|
|
109
|
+
resetToolForm: false,
|
|
110
|
+
});
|
|
111
|
+
const handleCancel = () => {
|
|
112
|
+
setEditingTool(undefined);
|
|
113
|
+
setIsCreating(false);
|
|
114
|
+
};
|
|
115
|
+
const activeFormTool = isCreating ? undefined : editingTool;
|
|
116
|
+
// Loading state
|
|
117
|
+
if (isLoading) {
|
|
118
|
+
return (React.createElement("div", { className: "min-h-screen bg-background" },
|
|
119
|
+
React.createElement(PageHeader, { eyebrow: "CONFIGURATION", title: "\u30AB\u30B9\u30BF\u30E0AI\u30C4\u30FC\u30EB\u8A2D\u5B9A", subtitle: "\u8AAD\u307F\u8FBC\u307F\u4E2D..." }),
|
|
120
|
+
React.createElement("main", { className: "mx-auto max-w-7xl px-6 py-8" },
|
|
121
|
+
React.createElement("div", { className: "flex items-center justify-center py-20" },
|
|
122
|
+
React.createElement("p", { className: "text-muted-foreground" }, "\u8A2D\u5B9A\u3092\u53D6\u5F97\u3057\u3066\u3044\u307E\u3059...")))));
|
|
123
|
+
}
|
|
124
|
+
// Error state
|
|
125
|
+
if (error) {
|
|
126
|
+
return (React.createElement("div", { className: "min-h-screen bg-background" },
|
|
127
|
+
React.createElement(PageHeader, { eyebrow: "CONFIGURATION", title: "\u30A8\u30E9\u30FC" }),
|
|
128
|
+
React.createElement("main", { className: "mx-auto max-w-7xl px-6 py-8" },
|
|
129
|
+
React.createElement(Alert, { variant: "destructive" },
|
|
130
|
+
React.createElement(AlertDescription, null, error instanceof Error ? error.message : "未知のエラーです")),
|
|
131
|
+
React.createElement("div", { className: "mt-4" },
|
|
132
|
+
React.createElement(Button, { variant: "ghost", asChild: true },
|
|
133
|
+
React.createElement(Link, { to: "/" }, "\u2190 \u30D6\u30E9\u30F3\u30C1\u4E00\u89A7\u306B\u623B\u308B"))))));
|
|
134
|
+
}
|
|
135
|
+
return (React.createElement("div", { className: "min-h-screen bg-background" },
|
|
136
|
+
React.createElement(PageHeader, { eyebrow: "CONFIGURATION", title: "\u30AB\u30B9\u30BF\u30E0AI\u30C4\u30FC\u30EB\u8A2D\u5B9A", subtitle: "tools.json \u3092\u7DE8\u96C6\u3057\u3066\u3001\u72EC\u81EA\u306EAI\u30C4\u30FC\u30EB\u3092CLI / Web UI \u4E21\u65B9\u304B\u3089\u5229\u7528\u3067\u304D\u307E\u3059\u3002" },
|
|
137
|
+
React.createElement("div", { className: "mt-4 flex flex-wrap gap-2" },
|
|
138
|
+
React.createElement(Button, { variant: "ghost", size: "sm", asChild: true },
|
|
139
|
+
React.createElement(Link, { to: "/" }, "\u2190 \u30D6\u30E9\u30F3\u30C1\u4E00\u89A7")),
|
|
140
|
+
React.createElement(Button, { variant: "secondary", onClick: handleCreate }, "\u30AB\u30B9\u30BF\u30E0\u30C4\u30FC\u30EB\u3092\u8FFD\u52A0"))),
|
|
141
|
+
banner && (React.createElement("div", { className: "mx-auto max-w-7xl px-6 pt-4" },
|
|
142
|
+
React.createElement(Alert, { variant: banner.type === "error"
|
|
143
|
+
? "destructive"
|
|
144
|
+
: banner.type === "success"
|
|
145
|
+
? "success"
|
|
146
|
+
: "info" },
|
|
147
|
+
React.createElement(AlertDescription, { className: "flex items-center justify-between" },
|
|
148
|
+
React.createElement("span", null, banner.message),
|
|
149
|
+
React.createElement(Button, { variant: "ghost", size: "sm", onClick: () => setBanner(null) }, "\u9589\u3058\u308B"))))),
|
|
150
|
+
React.createElement("main", { className: "mx-auto max-w-7xl space-y-6 px-6 py-8" },
|
|
151
|
+
React.createElement(Card, null,
|
|
152
|
+
React.createElement(CardHeader, { className: "pb-3" },
|
|
153
|
+
React.createElement("p", { className: "text-xs font-medium uppercase tracking-wider text-muted-foreground" }, "Environment Variables"),
|
|
154
|
+
React.createElement("h3", { className: "mt-1 text-lg font-semibold" }, "\u5171\u6709\u74B0\u5883\u5909\u6570"),
|
|
155
|
+
React.createElement("p", { className: "mt-2 text-sm text-muted-foreground" }, "Web UI \u3067\u8D77\u52D5\u3059\u308B AI \u30C4\u30FC\u30EB\u306F\u3053\u3053\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u74B0\u5883\u5909\u6570\u3092\u81EA\u52D5\u7684\u306B\u5F15\u304D\u7D99\u304E\u307E\u3059\u3002")),
|
|
156
|
+
React.createElement(CardContent, null,
|
|
157
|
+
React.createElement(EnvironmentEditor, { entries: envEntries, onEntryChange: handleEnvEntryChange, onAddEntry: handleEnvAdd, onRemoveEntry: handleEnvRemove, onSave: handleEnvSave, isSaving: updateConfig.isPending }))),
|
|
158
|
+
React.createElement(Card, null,
|
|
159
|
+
React.createElement(CardHeader, { className: "pb-3" },
|
|
160
|
+
React.createElement("p", { className: "text-xs font-medium uppercase tracking-wider text-muted-foreground" }, "Registered Tools"),
|
|
161
|
+
React.createElement("h3", { className: "mt-1 text-lg font-semibold" }, "\u767B\u9332\u6E08\u307F\u30C4\u30FC\u30EB"),
|
|
162
|
+
React.createElement("p", { className: "mt-2 text-sm text-muted-foreground" }, "CLI \u3068 Web UI \u306F\u540C\u3058\u8A2D\u5B9A\u3092\u53C2\u7167\u3057\u307E\u3059\u3002\u66F4\u65B0\u3059\u308B\u3068 ~/.claude-worktree/tools.json \u306B\u4FDD\u5B58\u3055\u308C\u307E\u3059\u3002")),
|
|
163
|
+
React.createElement(CardContent, null,
|
|
164
|
+
React.createElement(CustomToolList, { tools: sortedTools, onEdit: handleEdit, onDelete: handleDelete }))),
|
|
165
|
+
(isCreating || editingTool) && (React.createElement(Card, null,
|
|
166
|
+
React.createElement(CardContent, { className: "pt-6" },
|
|
167
|
+
React.createElement(CustomToolForm, { ...(activeFormTool ? { initialValue: activeFormTool } : {}), onSubmit: handleFormSubmit, onCancel: handleCancel, isSaving: updateConfig.isPending })))))));
|
|
168
|
+
}
|
|
169
|
+
// Helpers
|
|
170
|
+
function sanitizeEnvKey(value) {
|
|
171
|
+
return value
|
|
172
|
+
.toUpperCase()
|
|
173
|
+
.replace(/[^A-Z0-9_]/g, "")
|
|
174
|
+
.slice(0, ENV_KEY_MAX);
|
|
175
|
+
}
|
|
176
|
+
function createEnvEntry(initial) {
|
|
177
|
+
return {
|
|
178
|
+
id: `${initial?.key ?? "env"}-${Math.random().toString(36).slice(2, 8)}${Date.now().toString(36)}`,
|
|
179
|
+
key: initial?.key ?? "",
|
|
180
|
+
value: initial?.value ?? "",
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
function entriesFromVariables(variables) {
|
|
184
|
+
if (!variables?.length)
|
|
185
|
+
return [];
|
|
186
|
+
return [...variables]
|
|
187
|
+
.sort((a, b) => a.key.localeCompare(b.key, "en"))
|
|
188
|
+
.map((v) => createEnvEntry({ key: v.key, value: v.value }));
|
|
189
|
+
}
|
|
190
|
+
function buildEnvVariables(entries) {
|
|
191
|
+
const result = [];
|
|
192
|
+
const seen = new Set();
|
|
193
|
+
const timestamp = new Date().toISOString();
|
|
194
|
+
for (const entry of entries) {
|
|
195
|
+
const key = entry.key.trim();
|
|
196
|
+
const value = entry.value;
|
|
197
|
+
if (!key && !value)
|
|
198
|
+
continue;
|
|
199
|
+
if (!key)
|
|
200
|
+
throw new Error("環境変数のキーを入力してください。");
|
|
201
|
+
if (!ENV_KEY_REGEX.test(key))
|
|
202
|
+
throw new Error("環境変数キーは英大文字・数字・アンダースコアのみ使用できます。");
|
|
203
|
+
if (key.length > ENV_KEY_MAX)
|
|
204
|
+
throw new Error(`環境変数キーは最大${ENV_KEY_MAX}文字です。(${key})`);
|
|
205
|
+
if (!value)
|
|
206
|
+
throw new Error(`${key} の値を入力してください。`);
|
|
207
|
+
if (value.length > ENV_VALUE_MAX)
|
|
208
|
+
throw new Error(`${key} の値は最大${ENV_VALUE_MAX}文字です。`);
|
|
209
|
+
if (seen.has(key))
|
|
210
|
+
throw new Error(`環境変数キー "${key}" が重複しています。`);
|
|
211
|
+
seen.add(key);
|
|
212
|
+
result.push({ key, value, lastUpdated: timestamp });
|
|
213
|
+
}
|
|
214
|
+
return result;
|
|
215
|
+
}
|
|
216
|
+
//# sourceMappingURL=ConfigPage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ConfigPage.js","sourceRoot":"","sources":["../../../../../src/web/client/src/pages/ConfigPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.config.d.ts","sourceRoot":"","sources":["../../../src/web/client/vite.config.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"vite.config.d.ts","sourceRoot":"","sources":["../../../src/web/client/vite.config.ts"],"names":[],"mappings":";AAKA,wBAsBG"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import { defineConfig } from "vite";
|
|
2
2
|
import react from "@vitejs/plugin-react";
|
|
3
|
+
import tailwindcss from "@tailwindcss/vite";
|
|
3
4
|
import path from "node:path";
|
|
4
5
|
export default defineConfig({
|
|
5
|
-
plugins: [react()],
|
|
6
|
+
plugins: [react(), tailwindcss()],
|
|
7
|
+
resolve: {
|
|
8
|
+
alias: {
|
|
9
|
+
"@": path.resolve(__dirname, "./src"),
|
|
10
|
+
},
|
|
11
|
+
},
|
|
6
12
|
root: path.resolve(__dirname),
|
|
7
13
|
build: {
|
|
8
14
|
outDir: path.resolve(__dirname, "../../../dist/client"),
|
|
@@ -14,6 +20,7 @@ export default defineConfig({
|
|
|
14
20
|
"/api": {
|
|
15
21
|
target: "http://localhost:3000",
|
|
16
22
|
changeOrigin: true,
|
|
23
|
+
ws: true,
|
|
17
24
|
},
|
|
18
25
|
},
|
|
19
26
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite.config.js","sourceRoot":"","sources":["../../../src/web/client/vite.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,eAAe,YAAY,CAAC;IAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"vite.config.js","sourceRoot":"","sources":["../../../src/web/client/vite.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,eAAe,YAAY,CAAC;IAC1B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC;IACjC,OAAO,EAAE;QACP,KAAK,EAAE;YACL,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC;SACtC;KACF;IACD,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IAC7B,KAAK,EAAE;QACL,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,sBAAsB,CAAC;QACvD,WAAW,EAAE,IAAI;KAClB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,IAAI;QACV,KAAK,EAAE;YACL,MAAM,EAAE;gBACN,MAAM,EAAE,uBAAuB;gBAC/B,YAAY,EAAE,IAAI;gBAClB,EAAE,EAAE,IAAI;aACT;SACF;KACF;CACF,CAAC,CAAC"}
|
|
@@ -5,7 +5,29 @@
|
|
|
5
5
|
* 仕様: specs/SPEC-d5e56259/contracts/rest-api.yaml
|
|
6
6
|
*/
|
|
7
7
|
/**
|
|
8
|
-
* Web
|
|
8
|
+
* Web UI サーバーのライフサイクル操作ハンドル。
|
|
9
|
+
*
|
|
10
|
+
* `close()` は Web UI サーバーを停止し、関連リソース(PTY/トレイ等)を解放します。
|
|
11
|
+
*/
|
|
12
|
+
export interface WebServerHandle {
|
|
13
|
+
close: () => Promise<void>;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* `startWebServer` の起動オプション。
|
|
17
|
+
*/
|
|
18
|
+
export interface StartWebServerOptions {
|
|
19
|
+
/**
|
|
20
|
+
* true の場合、Web UI サーバーが CLI 本体の終了をブロックしないようにします。
|
|
21
|
+
* (内部で `server.unref()` を呼び、サーバーの存在がプロセス生存を維持しないようにします)
|
|
22
|
+
*/
|
|
23
|
+
background?: boolean;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Web UI サーバーを起動します。
|
|
27
|
+
*
|
|
28
|
+
* @param options - 起動オプション
|
|
29
|
+
* @returns Web UI サーバー停止用のハンドル
|
|
30
|
+
* @throws サーバー起動(listen/初期化)に失敗した場合
|
|
9
31
|
*/
|
|
10
|
-
export declare function startWebServer(): Promise<
|
|
32
|
+
export declare function startWebServer(options?: StartWebServerOptions): Promise<WebServerHandle>;
|
|
11
33
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/web/server/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/web/server/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAmBH;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,eAAe,CAAC,CA+E1B"}
|
package/dist/web/server/index.js
CHANGED
|
@@ -14,19 +14,25 @@ import { WebSocketHandler } from "./websocket/handler.js";
|
|
|
14
14
|
import { registerRoutes } from "./routes/index.js";
|
|
15
15
|
import { importOsEnvIntoSharedConfig } from "./env/importer.js";
|
|
16
16
|
import { createLogger } from "../../logging/logger.js";
|
|
17
|
+
import { disposeSystemTray, startSystemTray } from "./tray.js";
|
|
18
|
+
import { resolveWebUiPort } from "../../utils/webui.js";
|
|
17
19
|
const __filename = fileURLToPath(import.meta.url);
|
|
18
20
|
const __dirname = dirname(__filename);
|
|
19
21
|
/**
|
|
20
|
-
* Web
|
|
22
|
+
* Web UI サーバーを起動します。
|
|
23
|
+
*
|
|
24
|
+
* @param options - 起動オプション
|
|
25
|
+
* @returns Web UI サーバー停止用のハンドル
|
|
26
|
+
* @throws サーバー起動(listen/初期化)に失敗した場合
|
|
21
27
|
*/
|
|
22
|
-
export async function startWebServer() {
|
|
28
|
+
export async function startWebServer(options = {}) {
|
|
23
29
|
const serverLogger = createLogger({ category: "server" });
|
|
24
30
|
const fastify = Fastify({
|
|
25
31
|
loggerInstance: serverLogger,
|
|
26
32
|
});
|
|
27
33
|
// PTYマネージャーとWebSocketハンドラーを初期化
|
|
28
34
|
const ptyManager = new PTYManager();
|
|
29
|
-
const wsHandler = new WebSocketHandler(ptyManager);
|
|
35
|
+
const wsHandler = new WebSocketHandler(ptyManager, fastify.log);
|
|
30
36
|
// WebSocketサポートを追加
|
|
31
37
|
await fastify.register(fastifyWebsocket);
|
|
32
38
|
// WebSocketエンドポイント
|
|
@@ -45,18 +51,43 @@ export async function startWebServer() {
|
|
|
45
51
|
prefix: "/",
|
|
46
52
|
});
|
|
47
53
|
// サーバー起動
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
fastify.log.error(err);
|
|
59
|
-
process.exit(1);
|
|
54
|
+
const port = resolveWebUiPort();
|
|
55
|
+
// Docker環境からホストOSでアクセスできるよう、0.0.0.0でリッスン
|
|
56
|
+
// IPv4/IPv6両方対応のため、listenOnStart: false も検討可能
|
|
57
|
+
const host = process.env.HOST || "0.0.0.0";
|
|
58
|
+
await fastify.listen({ port, host });
|
|
59
|
+
const accessUrl = `http://localhost:${port}`;
|
|
60
|
+
serverLogger.info({ host, port, accessUrl }, "Web UI server started");
|
|
61
|
+
await startSystemTray(accessUrl);
|
|
62
|
+
if (options.background) {
|
|
63
|
+
fastify.server?.unref?.();
|
|
60
64
|
}
|
|
65
|
+
let closed = false;
|
|
66
|
+
return {
|
|
67
|
+
close: async () => {
|
|
68
|
+
if (closed)
|
|
69
|
+
return;
|
|
70
|
+
closed = true;
|
|
71
|
+
try {
|
|
72
|
+
try {
|
|
73
|
+
disposeSystemTray();
|
|
74
|
+
}
|
|
75
|
+
catch (err) {
|
|
76
|
+
serverLogger.warn({ err }, "System tray cleanup failed");
|
|
77
|
+
}
|
|
78
|
+
for (const session of ptyManager.list()) {
|
|
79
|
+
try {
|
|
80
|
+
ptyManager.delete(session.sessionId);
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
serverLogger.warn({ err, sessionId: session.sessionId }, "Failed to delete PTY session");
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
finally {
|
|
88
|
+
await fastify.close();
|
|
89
|
+
}
|
|
90
|
+
},
|
|
91
|
+
};
|
|
61
92
|
}
|
|
62
93
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/web/server/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/web/server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,18 @@ export declare class PTYManager {
|
|
|
18
18
|
/**
|
|
19
19
|
* 新しいPTYセッションを作成
|
|
20
20
|
*/
|
|
21
|
-
spawn(toolType: "claude-code" | "codex-cli" | "custom", worktreePath: string, mode: "normal" | "continue" | "resume",
|
|
21
|
+
spawn(toolType: "claude-code" | "codex-cli" | "custom", worktreePath: string, mode: "normal" | "continue" | "resume", options?: {
|
|
22
|
+
toolName?: string | null;
|
|
23
|
+
cols?: number;
|
|
24
|
+
rows?: number;
|
|
25
|
+
skipPermissions?: boolean;
|
|
26
|
+
bypassApprovals?: boolean;
|
|
27
|
+
extraArgs?: string[];
|
|
28
|
+
customToolId?: string | null;
|
|
29
|
+
}): Promise<{
|
|
22
30
|
sessionId: string;
|
|
23
31
|
session: AIToolSession;
|
|
24
|
-
}
|
|
32
|
+
}>;
|
|
25
33
|
/**
|
|
26
34
|
* セッションIDからPTYインスタンスを取得
|
|
27
35
|
*/
|
|
@@ -38,13 +46,7 @@ export declare class PTYManager {
|
|
|
38
46
|
* すべてのセッション一覧を取得
|
|
39
47
|
*/
|
|
40
48
|
list(): AIToolSession[];
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
*/
|
|
44
|
-
private buildCommand;
|
|
45
|
-
/**
|
|
46
|
-
* AI Toolの引数を構築
|
|
47
|
-
*/
|
|
48
|
-
private buildArgs;
|
|
49
|
+
private resolveCommand;
|
|
50
|
+
private loadSharedEnv;
|
|
49
51
|
}
|
|
50
52
|
//# sourceMappingURL=manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/web/server/pty/manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/web/server/pty/manager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAU3D,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,IAAI,CAAC;IACjB,OAAO,EAAE,aAAa,CAAC;CACxB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAuC;IAExD;;OAEG;IACU,KAAK,CAChB,QAAQ,EAAE,aAAa,GAAG,WAAW,GAAG,QAAQ,EAChD,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,EACtC,OAAO,GAAE;QACP,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACzB,GACL,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,aAAa,CAAA;KAAE,CAAC;IA6EzD;;OAEG;IACI,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;IAItD;;OAEG;IACI,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAiBzC;;OAEG;IACI,YAAY,CACjB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAC/B,QAAQ,CAAC,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO;IAoBV;;OAEG;IACI,IAAI,IAAI,aAAa,EAAE;YAIhB,cAAc;YA+Dd,aAAa;CAI5B"}
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import * as pty from "node-pty";
|
|
8
8
|
import { randomUUID } from "node:crypto";
|
|
9
|
+
import { resolveClaudeCommand, resolveCodexCommand, resolveCustomToolCommand, AIToolResolutionError, } from "../../../services/aiToolResolver.js";
|
|
10
|
+
import { loadToolsConfig } from "../../../config/tools.js";
|
|
9
11
|
/**
|
|
10
12
|
* PTYマネージャー - セッションとPTYプロセスのライフサイクル管理
|
|
11
13
|
*/
|
|
@@ -14,27 +16,53 @@ export class PTYManager {
|
|
|
14
16
|
/**
|
|
15
17
|
* 新しいPTYセッションを作成
|
|
16
18
|
*/
|
|
17
|
-
spawn(toolType, worktreePath, mode,
|
|
19
|
+
async spawn(toolType, worktreePath, mode, options = {}) {
|
|
20
|
+
const cols = options.cols ?? 80;
|
|
21
|
+
const rows = options.rows ?? 24;
|
|
22
|
+
const toolName = options.toolName ?? null;
|
|
18
23
|
const sessionId = randomUUID();
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
24
|
+
const resolverOptions = {};
|
|
25
|
+
if (toolName !== null) {
|
|
26
|
+
resolverOptions.toolName = toolName;
|
|
27
|
+
}
|
|
28
|
+
if (options.skipPermissions !== undefined) {
|
|
29
|
+
resolverOptions.skipPermissions = options.skipPermissions;
|
|
30
|
+
}
|
|
31
|
+
if (options.bypassApprovals !== undefined) {
|
|
32
|
+
resolverOptions.bypassApprovals = options.bypassApprovals;
|
|
33
|
+
}
|
|
34
|
+
if (options.extraArgs && options.extraArgs.length > 0) {
|
|
35
|
+
resolverOptions.extraArgs = options.extraArgs;
|
|
36
|
+
}
|
|
37
|
+
if (options.customToolId !== undefined) {
|
|
38
|
+
resolverOptions.customToolId = options.customToolId;
|
|
39
|
+
}
|
|
40
|
+
const resolved = await this.resolveCommand(toolType, mode, resolverOptions);
|
|
41
|
+
const sharedEnv = await this.loadSharedEnv();
|
|
42
|
+
const env = {
|
|
43
|
+
...process.env,
|
|
44
|
+
...sharedEnv,
|
|
45
|
+
TERM: "xterm-256color",
|
|
46
|
+
COLORTERM: "truecolor",
|
|
47
|
+
};
|
|
48
|
+
if (resolved.env) {
|
|
49
|
+
Object.assign(env, resolved.env);
|
|
50
|
+
}
|
|
51
|
+
if (toolType === "claude-code" && options.skipPermissions && isRootUser()) {
|
|
52
|
+
env.IS_SANDBOX = "1";
|
|
53
|
+
}
|
|
22
54
|
// PTYプロセスをスポーン
|
|
23
|
-
const ptyProcess = pty.spawn(command, args, {
|
|
55
|
+
const ptyProcess = pty.spawn(resolved.command, resolved.args, {
|
|
24
56
|
name: "xterm-256color",
|
|
25
57
|
cols,
|
|
26
58
|
rows,
|
|
27
59
|
cwd: worktreePath,
|
|
28
|
-
env
|
|
29
|
-
...process.env,
|
|
30
|
-
TERM: "xterm-256color",
|
|
31
|
-
COLORTERM: "truecolor",
|
|
32
|
-
},
|
|
60
|
+
env,
|
|
33
61
|
});
|
|
34
62
|
const session = {
|
|
35
63
|
sessionId,
|
|
36
64
|
toolType,
|
|
37
|
-
toolName: toolName
|
|
65
|
+
toolName: options.customToolId ?? toolName ?? null,
|
|
38
66
|
mode,
|
|
39
67
|
worktreePath,
|
|
40
68
|
ptyPid: ptyProcess.pid,
|
|
@@ -98,46 +126,51 @@ export class PTYManager {
|
|
|
98
126
|
list() {
|
|
99
127
|
return Array.from(this.instances.values()).map((inst) => inst.session);
|
|
100
128
|
}
|
|
101
|
-
|
|
102
|
-
* AI Toolのコマンドを構築
|
|
103
|
-
*/
|
|
104
|
-
buildCommand(toolType, mode, toolName) {
|
|
105
|
-
if (toolType === "custom" && toolName) {
|
|
106
|
-
// カスタムツールは別途config.jsonから取得する必要があるが、
|
|
107
|
-
// ここでは簡易実装としてtoolNameをそのままコマンドとして使用
|
|
108
|
-
return toolName;
|
|
109
|
-
}
|
|
110
|
-
if (toolType === "codex-cli") {
|
|
111
|
-
return "codex";
|
|
112
|
-
}
|
|
113
|
-
// claude-code
|
|
114
|
-
return "claude";
|
|
115
|
-
}
|
|
116
|
-
/**
|
|
117
|
-
* AI Toolの引数を構築
|
|
118
|
-
*/
|
|
119
|
-
buildArgs(toolType, mode) {
|
|
129
|
+
async resolveCommand(toolType, mode, options) {
|
|
120
130
|
if (toolType === "custom") {
|
|
121
|
-
|
|
122
|
-
|
|
131
|
+
const toolId = options.customToolId ?? options.toolName;
|
|
132
|
+
if (!toolId) {
|
|
133
|
+
throw new AIToolResolutionError("COMMAND_NOT_FOUND", "Custom tool identifier is required to start a session.");
|
|
134
|
+
}
|
|
135
|
+
return resolveCustomToolCommand({
|
|
136
|
+
toolId,
|
|
137
|
+
mode,
|
|
138
|
+
...(options.skipPermissions !== undefined
|
|
139
|
+
? { skipPermissions: options.skipPermissions }
|
|
140
|
+
: {}),
|
|
141
|
+
...(options.extraArgs ? { extraArgs: options.extraArgs } : {}),
|
|
142
|
+
});
|
|
123
143
|
}
|
|
124
144
|
if (toolType === "codex-cli") {
|
|
125
|
-
|
|
126
|
-
|
|
145
|
+
const codexOptions = { mode };
|
|
146
|
+
if (options.bypassApprovals !== undefined) {
|
|
147
|
+
codexOptions.bypassApprovals = options.bypassApprovals;
|
|
127
148
|
}
|
|
128
|
-
if (
|
|
129
|
-
|
|
149
|
+
if (options.extraArgs && options.extraArgs.length > 0) {
|
|
150
|
+
codexOptions.extraArgs = options.extraArgs;
|
|
130
151
|
}
|
|
131
|
-
return
|
|
152
|
+
return resolveCodexCommand(codexOptions);
|
|
132
153
|
}
|
|
133
|
-
|
|
134
|
-
if (
|
|
135
|
-
|
|
154
|
+
const claudeOptions = { mode };
|
|
155
|
+
if (options.skipPermissions !== undefined) {
|
|
156
|
+
claudeOptions.skipPermissions = options.skipPermissions;
|
|
136
157
|
}
|
|
137
|
-
if (
|
|
138
|
-
|
|
158
|
+
if (options.extraArgs && options.extraArgs.length > 0) {
|
|
159
|
+
claudeOptions.extraArgs = options.extraArgs;
|
|
139
160
|
}
|
|
140
|
-
return
|
|
161
|
+
return resolveClaudeCommand(claudeOptions);
|
|
162
|
+
}
|
|
163
|
+
async loadSharedEnv() {
|
|
164
|
+
const config = await loadToolsConfig();
|
|
165
|
+
return { ...(config.env ?? {}) };
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
function isRootUser() {
|
|
169
|
+
try {
|
|
170
|
+
return typeof process.getuid === "function" && process.getuid() === 0;
|
|
171
|
+
}
|
|
172
|
+
catch {
|
|
173
|
+
return false;
|
|
141
174
|
}
|
|
142
175
|
}
|
|
143
176
|
//# sourceMappingURL=manager.js.map
|