@akiojin/gwt 4.8.0 → 4.9.1
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 +58 -34
- package/README.md +19 -35
- package/dist/cli/ui/components/App.d.ts +2 -2
- package/dist/cli/ui/components/App.d.ts.map +1 -1
- package/dist/cli/ui/components/App.js +8 -8
- package/dist/cli/ui/components/App.js.map +1 -1
- package/dist/cli/ui/components/screens/BranchListScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/BranchListScreen.js +3 -1
- package/dist/cli/ui/components/screens/BranchListScreen.js.map +1 -1
- package/dist/cli/ui/components/screens/CodingAgentSelectorScreen.d.ts +27 -0
- package/dist/cli/ui/components/screens/CodingAgentSelectorScreen.d.ts.map +1 -0
- package/dist/cli/ui/components/screens/{AIToolSelectorScreen.js → CodingAgentSelectorScreen.js} +35 -35
- package/dist/cli/ui/components/screens/CodingAgentSelectorScreen.js.map +1 -0
- package/dist/cli/ui/components/screens/ModelSelectorScreen.d.ts +2 -2
- package/dist/cli/ui/components/screens/ModelSelectorScreen.d.ts.map +1 -1
- package/dist/cli/ui/components/screens/ModelSelectorScreen.js.map +1 -1
- package/dist/cli/ui/types.d.ts +2 -2
- package/dist/cli/ui/types.d.ts.map +1 -1
- package/dist/cli/ui/utils/modelOptions.d.ts +4 -4
- package/dist/cli/ui/utils/modelOptions.d.ts.map +1 -1
- package/dist/cli/ui/utils/modelOptions.js.map +1 -1
- package/dist/client/assets/{index-PqK9jkug.js → index-LNPtOrn3.js} +17 -17
- package/dist/client/index.html +1 -1
- package/dist/config/builtin-coding-agents.d.ts +23 -0
- package/dist/config/builtin-coding-agents.d.ts.map +1 -0
- package/dist/config/{builtin-tools.js → builtin-coding-agents.js} +6 -6
- package/dist/config/builtin-coding-agents.js.map +1 -0
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +3 -7
- package/dist/config/index.js.map +1 -1
- package/dist/config/profiles.d.ts +2 -2
- package/dist/config/profiles.d.ts.map +1 -1
- package/dist/config/profiles.js +4 -7
- package/dist/config/profiles.js.map +1 -1
- package/dist/config/tools.d.ts +17 -17
- package/dist/config/tools.d.ts.map +1 -1
- package/dist/config/tools.js +84 -121
- package/dist/config/tools.js.map +1 -1
- package/dist/index.js +19 -19
- package/dist/index.js.map +1 -1
- package/dist/launcher.d.ts +8 -8
- package/dist/launcher.d.ts.map +1 -1
- package/dist/launcher.js +32 -28
- package/dist/launcher.js.map +1 -1
- package/dist/services/codingAgentCommandResolver.d.ts +10 -0
- package/dist/services/codingAgentCommandResolver.d.ts.map +1 -0
- package/dist/services/{customToolResolver.js → codingAgentCommandResolver.js} +25 -20
- package/dist/services/codingAgentCommandResolver.js.map +1 -0
- package/dist/services/{aiToolResolver.d.ts → codingAgentResolver.d.ts} +6 -6
- package/dist/services/codingAgentResolver.d.ts.map +1 -0
- package/dist/services/{aiToolResolver.js → codingAgentResolver.js} +23 -23
- package/dist/services/codingAgentResolver.js.map +1 -0
- package/dist/shared/{aiToolConstants.d.ts → codingAgentConstants.d.ts} +2 -2
- package/dist/shared/codingAgentConstants.d.ts.map +1 -0
- package/dist/shared/{aiToolConstants.js → codingAgentConstants.js} +2 -2
- package/dist/shared/codingAgentConstants.js.map +1 -0
- package/dist/types/api.d.ts +12 -12
- package/dist/types/api.d.ts.map +1 -1
- package/dist/types/tools.d.ts +30 -30
- package/dist/types/tools.d.ts.map +1 -1
- package/dist/types/tools.js +1 -1
- package/dist/utils/command.d.ts +11 -0
- package/dist/utils/command.d.ts.map +1 -1
- package/dist/utils/command.js +33 -0
- package/dist/utils/command.js.map +1 -1
- package/dist/web/client/src/components/CodingAgentLaunchModal.d.ts +9 -0
- package/dist/web/client/src/components/CodingAgentLaunchModal.d.ts.map +1 -0
- package/dist/web/client/src/components/{AIToolLaunchModal.js → CodingAgentLaunchModal.js} +58 -58
- package/dist/web/client/src/components/CodingAgentLaunchModal.js.map +1 -0
- package/dist/web/client/src/components/CustomCodingAgentForm.d.ts +23 -0
- package/dist/web/client/src/components/CustomCodingAgentForm.d.ts.map +1 -0
- package/dist/web/client/src/components/{CustomToolForm.js → CustomCodingAgentForm.js} +5 -5
- package/dist/web/client/src/components/CustomCodingAgentForm.js.map +1 -0
- package/dist/web/client/src/components/CustomCodingAgentList.d.ts +10 -0
- package/dist/web/client/src/components/CustomCodingAgentList.d.ts.map +1 -0
- package/dist/web/client/src/components/{CustomToolList.js → CustomCodingAgentList.js} +17 -17
- package/dist/web/client/src/components/CustomCodingAgentList.js.map +1 -0
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.d.ts +2 -2
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.d.ts.map +1 -1
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.js +6 -6
- package/dist/web/client/src/components/branch-detail/SessionHistoryTable.js.map +1 -1
- package/dist/web/client/src/components/branch-detail/ToolLauncher.d.ts +2 -2
- package/dist/web/client/src/components/branch-detail/ToolLauncher.d.ts.map +1 -1
- package/dist/web/client/src/components/branch-detail/ToolLauncher.js +5 -5
- package/dist/web/client/src/components/branch-detail/ToolLauncher.js.map +1 -1
- package/dist/web/client/src/hooks/useSessions.d.ts +4 -4
- package/dist/web/client/src/hooks/useSessions.d.ts.map +1 -1
- package/dist/web/client/src/hooks/useSessions.js.map +1 -1
- package/dist/web/client/src/lib/api.d.ts +5 -5
- package/dist/web/client/src/lib/api.d.ts.map +1 -1
- package/dist/web/client/src/lib/api.js +1 -1
- package/dist/web/client/src/lib/api.js.map +1 -1
- package/dist/web/client/src/pages/BranchDetailPage.js +24 -24
- package/dist/web/client/src/pages/BranchDetailPage.js.map +1 -1
- package/dist/web/client/src/pages/ConfigManagementPage.d.ts.map +1 -1
- package/dist/web/client/src/pages/ConfigManagementPage.js +15 -15
- package/dist/web/client/src/pages/ConfigManagementPage.js.map +1 -1
- package/dist/web/client/src/pages/ConfigPage.d.ts.map +1 -1
- package/dist/web/client/src/pages/ConfigPage.js +44 -40
- package/dist/web/client/src/pages/ConfigPage.js.map +1 -1
- package/dist/web/server/env/importer.d.ts.map +1 -1
- package/dist/web/server/env/importer.js +3 -3
- package/dist/web/server/env/importer.js.map +1 -1
- package/dist/web/server/pty/manager.d.ts +6 -6
- package/dist/web/server/pty/manager.d.ts.map +1 -1
- package/dist/web/server/pty/manager.js +11 -11
- package/dist/web/server/pty/manager.js.map +1 -1
- package/dist/web/server/routes/config.d.ts.map +1 -1
- package/dist/web/server/routes/config.js +34 -34
- package/dist/web/server/routes/config.js.map +1 -1
- package/dist/web/server/routes/sessions.d.ts +1 -1
- package/dist/web/server/routes/sessions.d.ts.map +1 -1
- package/dist/web/server/routes/sessions.js +20 -20
- package/dist/web/server/routes/sessions.js.map +1 -1
- package/package.json +2 -2
- package/src/cli/ui/__tests__/components/screens/{AIToolSelectorScreen.test.tsx → CodingAgentSelectorScreen.test.tsx} +38 -38
- package/src/cli/ui/components/App.tsx +22 -20
- package/src/cli/ui/components/screens/BranchListScreen.tsx +4 -2
- package/src/cli/ui/components/screens/CodingAgentSelectorScreen.tsx +159 -0
- package/src/cli/ui/components/screens/ModelSelectorScreen.tsx +6 -2
- package/src/cli/ui/types.ts +2 -2
- package/src/cli/ui/utils/modelOptions.ts +6 -4
- package/src/config/{builtin-tools.ts → builtin-coding-agents.ts} +9 -9
- package/src/config/index.ts +3 -7
- package/src/config/profiles.ts +4 -7
- package/src/config/tools.ts +107 -148
- package/src/index.ts +19 -19
- package/src/launcher.ts +38 -31
- package/src/services/{customToolResolver.ts → codingAgentCommandResolver.ts} +33 -28
- package/src/services/{aiToolResolver.ts → codingAgentResolver.ts} +28 -28
- package/src/shared/{aiToolConstants.ts → codingAgentConstants.ts} +1 -1
- package/src/types/api.ts +12 -12
- package/src/types/tools.ts +30 -30
- package/src/utils/command.ts +37 -0
- package/src/web/client/src/components/{AIToolLaunchModal.tsx → CodingAgentLaunchModal.tsx} +74 -70
- package/src/web/client/src/components/{CustomToolForm.tsx → CustomCodingAgentForm.tsx} +14 -14
- package/src/web/client/src/components/{CustomToolList.tsx → CustomCodingAgentList.tsx} +26 -26
- package/src/web/client/src/components/branch-detail/SessionHistoryTable.tsx +7 -7
- package/src/web/client/src/components/branch-detail/ToolLauncher.tsx +9 -9
- package/src/web/client/src/hooks/useSessions.ts +5 -5
- package/src/web/client/src/lib/api.ts +8 -8
- package/src/web/client/src/pages/BranchDetailPage.tsx +26 -26
- package/src/web/client/src/pages/ConfigManagementPage.tsx +32 -24
- package/src/web/client/src/pages/ConfigPage.tsx +57 -51
- package/src/web/server/env/importer.ts +6 -3
- package/src/web/server/pty/manager.ts +20 -20
- package/src/web/server/routes/config.ts +45 -39
- package/src/web/server/routes/sessions.ts +29 -26
- package/dist/cli/ui/components/screens/AIToolSelectorScreen.d.ts +0 -27
- package/dist/cli/ui/components/screens/AIToolSelectorScreen.d.ts.map +0 -1
- package/dist/cli/ui/components/screens/AIToolSelectorScreen.js.map +0 -1
- package/dist/config/builtin-tools.d.ts +0 -23
- package/dist/config/builtin-tools.d.ts.map +0 -1
- package/dist/config/builtin-tools.js.map +0 -1
- package/dist/services/aiToolResolver.d.ts.map +0 -1
- package/dist/services/aiToolResolver.js.map +0 -1
- package/dist/services/customToolResolver.d.ts +0 -10
- package/dist/services/customToolResolver.d.ts.map +0 -1
- package/dist/services/customToolResolver.js.map +0 -1
- package/dist/shared/aiToolConstants.d.ts.map +0 -1
- package/dist/shared/aiToolConstants.js.map +0 -1
- package/dist/web/client/src/components/AIToolLaunchModal.d.ts +0 -9
- package/dist/web/client/src/components/AIToolLaunchModal.d.ts.map +0 -1
- package/dist/web/client/src/components/AIToolLaunchModal.js.map +0 -1
- package/dist/web/client/src/components/CustomToolForm.d.ts +0 -23
- package/dist/web/client/src/components/CustomToolForm.d.ts.map +0 -1
- package/dist/web/client/src/components/CustomToolForm.js.map +0 -1
- package/dist/web/client/src/components/CustomToolList.d.ts +0 -10
- package/dist/web/client/src/components/CustomToolList.d.ts.map +0 -1
- package/dist/web/client/src/components/CustomToolList.js.map +0 -1
- package/src/cli/ui/components/screens/AIToolSelectorScreen.tsx +0 -153
- package/src/index.ts.backup +0 -1543
package/dist/launcher.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* コーディングエージェント起動機能
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* コーディングエージェントの起動処理を管理します。
|
|
5
5
|
* 3つの実行タイプ(path, bunx, command)をサポートします。
|
|
6
6
|
*/
|
|
7
7
|
import { execa } from "execa";
|
|
@@ -48,19 +48,19 @@ export async function resolveCommand(commandName) {
|
|
|
48
48
|
* defaultArgs + modeArgs[mode] + extraArgs の順で引数を結合します。
|
|
49
49
|
* 未定義のフィールドは空配列として扱います。
|
|
50
50
|
*
|
|
51
|
-
* @param
|
|
51
|
+
* @param agent - コーディングエージェント定義
|
|
52
52
|
* @param options - 起動オプション
|
|
53
53
|
* @returns 結合された引数配列
|
|
54
54
|
*/
|
|
55
|
-
function buildArgs(
|
|
55
|
+
function buildArgs(agent, options) {
|
|
56
56
|
const args = [];
|
|
57
57
|
// 1. defaultArgs
|
|
58
|
-
if (
|
|
59
|
-
args.push(...
|
|
58
|
+
if (agent.defaultArgs) {
|
|
59
|
+
args.push(...agent.defaultArgs);
|
|
60
60
|
}
|
|
61
61
|
// 2. modeArgs[mode]
|
|
62
62
|
const mode = options.mode || "normal";
|
|
63
|
-
const modeArgs =
|
|
63
|
+
const modeArgs = agent.modeArgs[mode];
|
|
64
64
|
if (modeArgs) {
|
|
65
65
|
args.push(...modeArgs);
|
|
66
66
|
}
|
|
@@ -68,25 +68,29 @@ function buildArgs(tool, options) {
|
|
|
68
68
|
if (options.extraArgs) {
|
|
69
69
|
args.push(...options.extraArgs);
|
|
70
70
|
}
|
|
71
|
-
logger.debug({
|
|
71
|
+
logger.debug({
|
|
72
|
+
agentId: agent.id,
|
|
73
|
+
mode: options.mode ?? "normal",
|
|
74
|
+
argsCount: args.length,
|
|
75
|
+
}, "Args built");
|
|
72
76
|
return args;
|
|
73
77
|
}
|
|
74
78
|
/**
|
|
75
|
-
*
|
|
79
|
+
* コーディングエージェントを起動
|
|
76
80
|
*
|
|
77
|
-
*
|
|
78
|
-
* stdio: "inherit"
|
|
81
|
+
* エージェントの実行タイプ(path/bunx/command)に応じて適切な方法で起動します。
|
|
82
|
+
* stdio: "inherit" で起動するため、エージェントの入出力は親プロセスに継承されます。
|
|
79
83
|
*
|
|
80
|
-
* @param
|
|
84
|
+
* @param agent - コーディングエージェント定義
|
|
81
85
|
* @param options - 起動オプション
|
|
82
86
|
* @throws 起動に失敗した場合
|
|
83
87
|
*/
|
|
84
|
-
export async function
|
|
85
|
-
const args = buildArgs(
|
|
88
|
+
export async function launchCodingAgent(agent, options = {}) {
|
|
89
|
+
const args = buildArgs(agent, options);
|
|
86
90
|
const env = {
|
|
87
91
|
...process.env,
|
|
88
92
|
...(options.sharedEnv ?? {}),
|
|
89
|
-
...(
|
|
93
|
+
...(agent.env ?? {}),
|
|
90
94
|
};
|
|
91
95
|
// execa共通オプション(cwdがundefinedの場合は含めない)
|
|
92
96
|
const execaOptions = {
|
|
@@ -95,36 +99,36 @@ export async function launchCustomAITool(tool, options = {}) {
|
|
|
95
99
|
env,
|
|
96
100
|
};
|
|
97
101
|
logger.info({
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
command:
|
|
102
|
+
agentId: agent.id,
|
|
103
|
+
agentType: agent.type,
|
|
104
|
+
command: agent.command,
|
|
101
105
|
mode: options.mode ?? "normal",
|
|
102
|
-
}, "Launching
|
|
103
|
-
switch (
|
|
106
|
+
}, "Launching coding agent");
|
|
107
|
+
switch (agent.type) {
|
|
104
108
|
case "path": {
|
|
105
109
|
// 絶対パスで直接実行
|
|
106
|
-
await execa(
|
|
107
|
-
logger.info({
|
|
110
|
+
await execa(agent.command, args, execaOptions);
|
|
111
|
+
logger.info({ agentId: agent.id }, "Coding agent completed (path)");
|
|
108
112
|
break;
|
|
109
113
|
}
|
|
110
114
|
case "bunx": {
|
|
111
115
|
// bunx経由でパッケージ実行
|
|
112
116
|
// bunx [package] [args...]
|
|
113
|
-
await execa("bunx", [
|
|
114
|
-
logger.info({
|
|
117
|
+
await execa("bunx", [agent.command, ...args], execaOptions);
|
|
118
|
+
logger.info({ agentId: agent.id }, "Coding agent completed (bunx)");
|
|
115
119
|
break;
|
|
116
120
|
}
|
|
117
121
|
case "command": {
|
|
118
122
|
// PATH解決 → 実行
|
|
119
|
-
const resolvedPath = await resolveCommand(
|
|
123
|
+
const resolvedPath = await resolveCommand(agent.command);
|
|
120
124
|
await execa(resolvedPath, args, execaOptions);
|
|
121
|
-
logger.info({
|
|
125
|
+
logger.info({ agentId: agent.id }, "Coding agent completed (command)");
|
|
122
126
|
break;
|
|
123
127
|
}
|
|
124
128
|
default: {
|
|
125
129
|
// TypeScriptの型チェックで到達不可能だが、実行時の安全性のため
|
|
126
|
-
const exhaustiveCheck =
|
|
127
|
-
throw new Error(`Unknown
|
|
130
|
+
const exhaustiveCheck = agent.type;
|
|
131
|
+
throw new Error(`Unknown agent execution type: ${exhaustiveCheck}`);
|
|
128
132
|
}
|
|
129
133
|
}
|
|
130
134
|
}
|
package/dist/launcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;AAEtD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,WAAmB;IACtD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;IAEtE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAExD,wCAAwC;QACxC,MAAM,YAAY,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEjE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,EAAE,2BAA2B,CAAC,CAAC;YAC3D,MAAM,IAAI,KAAK,CACb,YAAY,WAAW,wBAAwB;gBAC7C,yFAAyF,CAC5F,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAChE,OAAO,YAAY,CAAC;IACtB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;QAC3B,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,MAAM,CAAC,KAAK,CACV,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EACrC,2BAA2B,CAC5B,CAAC;YACF,MAAM,IAAI,KAAK,CACb,8BAA8B,WAAW,MAAM;gBAC7C,UAAU,KAAK,CAAC,OAAO,IAAI;gBAC3B,yFAAyF,CAC5F,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,SAAS,
|
|
1
|
+
{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { CodingAgent, CodingAgentLaunchOptions } from "../types/tools.js";
|
|
2
|
+
export interface CodingAgentExecutionPlan {
|
|
3
|
+
command: string;
|
|
4
|
+
args: string[];
|
|
5
|
+
env?: NodeJS.ProcessEnv;
|
|
6
|
+
}
|
|
7
|
+
export declare function resolveCommandPath(commandName: string): Promise<string>;
|
|
8
|
+
export declare function buildCodingAgentArgs(agent: CodingAgent, options?: CodingAgentLaunchOptions): string[];
|
|
9
|
+
export declare function prepareCodingAgentExecution(agent: CodingAgent, options?: CodingAgentLaunchOptions): Promise<CodingAgentExecutionPlan>;
|
|
10
|
+
//# sourceMappingURL=codingAgentCommandResolver.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codingAgentCommandResolver.d.ts","sourceRoot":"","sources":["../../src/services/codingAgentCommandResolver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAK/E,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAID,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAqB7E;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,WAAW,EAClB,OAAO,GAAE,wBAA6B,GACrC,MAAM,EAAE,CA0BV;AAED,wBAAsB,2BAA2B,CAC/C,KAAK,EAAE,WAAW,EAClB,OAAO,GAAE,wBAA6B,GACrC,OAAO,CAAC,wBAAwB,CAAC,CA8CnC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { execa } from "execa";
|
|
2
2
|
import { createLogger } from "../logging/logger.js";
|
|
3
|
-
const logger = createLogger({ category: "
|
|
3
|
+
const logger = createLogger({ category: "agent-resolver" });
|
|
4
4
|
const WHICH_COMMAND = process.platform === "win32" ? "where" : "which";
|
|
5
5
|
export async function resolveCommandPath(commandName) {
|
|
6
6
|
try {
|
|
@@ -19,58 +19,63 @@ export async function resolveCommandPath(commandName) {
|
|
|
19
19
|
"Please ensure the command is installed and available in your PATH.");
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
export function
|
|
22
|
+
export function buildCodingAgentArgs(agent, options = {}) {
|
|
23
23
|
const args = [];
|
|
24
|
-
if (
|
|
25
|
-
args.push(...
|
|
24
|
+
if (agent.defaultArgs?.length) {
|
|
25
|
+
args.push(...agent.defaultArgs);
|
|
26
26
|
}
|
|
27
27
|
const mode = options.mode ?? "normal";
|
|
28
|
-
const modeArgs =
|
|
28
|
+
const modeArgs = agent.modeArgs?.[mode];
|
|
29
29
|
if (modeArgs?.length) {
|
|
30
30
|
args.push(...modeArgs);
|
|
31
31
|
}
|
|
32
|
-
if (options.skipPermissions &&
|
|
33
|
-
args.push(...
|
|
32
|
+
if (options.skipPermissions && agent.permissionSkipArgs?.length) {
|
|
33
|
+
args.push(...agent.permissionSkipArgs);
|
|
34
34
|
}
|
|
35
35
|
if (options.extraArgs?.length) {
|
|
36
36
|
args.push(...options.extraArgs);
|
|
37
37
|
}
|
|
38
|
-
logger.debug({
|
|
38
|
+
logger.debug({ agentId: agent.id, argsCount: args.length }, "Coding agent args built");
|
|
39
39
|
return args;
|
|
40
40
|
}
|
|
41
|
-
export async function
|
|
42
|
-
const baseArgs =
|
|
43
|
-
const envOverrides =
|
|
44
|
-
? { ...
|
|
41
|
+
export async function prepareCodingAgentExecution(agent, options = {}) {
|
|
42
|
+
const baseArgs = buildCodingAgentArgs(agent, options);
|
|
43
|
+
const envOverrides = agent.env
|
|
44
|
+
? { ...agent.env }
|
|
45
45
|
: undefined;
|
|
46
46
|
let command;
|
|
47
47
|
let args;
|
|
48
|
-
switch (
|
|
48
|
+
switch (agent.type) {
|
|
49
49
|
case "path": {
|
|
50
|
-
command =
|
|
50
|
+
command = agent.command;
|
|
51
51
|
args = baseArgs;
|
|
52
52
|
break;
|
|
53
53
|
}
|
|
54
54
|
case "bunx": {
|
|
55
55
|
command = "bunx";
|
|
56
|
-
args = [
|
|
56
|
+
args = [agent.command, ...baseArgs];
|
|
57
57
|
break;
|
|
58
58
|
}
|
|
59
59
|
case "command": {
|
|
60
|
-
command = await resolveCommandPath(
|
|
60
|
+
command = await resolveCommandPath(agent.command);
|
|
61
61
|
args = baseArgs;
|
|
62
62
|
break;
|
|
63
63
|
}
|
|
64
64
|
default: {
|
|
65
|
-
const exhaustive =
|
|
66
|
-
throw new Error(`Unknown
|
|
65
|
+
const exhaustive = agent.type;
|
|
66
|
+
throw new Error(`Unknown coding agent type: ${exhaustive}`);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
-
logger.debug({
|
|
69
|
+
logger.debug({
|
|
70
|
+
agentId: agent.id,
|
|
71
|
+
agentType: agent.type,
|
|
72
|
+
command,
|
|
73
|
+
hasEnv: !!envOverrides,
|
|
74
|
+
}, "Coding agent execution prepared");
|
|
70
75
|
return {
|
|
71
76
|
command,
|
|
72
77
|
args,
|
|
73
78
|
...(envOverrides ? { env: envOverrides } : {}),
|
|
74
79
|
};
|
|
75
80
|
}
|
|
76
|
-
//# sourceMappingURL=
|
|
81
|
+
//# sourceMappingURL=codingAgentCommandResolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codingAgentCommandResolver.js","sourceRoot":"","sources":["../../src/services/codingAgentCommandResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { CodingAgentLaunchOptions } from "../types/tools.js";
|
|
2
2
|
export declare const CLAUDE_CLI_PACKAGE = "@anthropic-ai/claude-code@latest";
|
|
3
3
|
export declare const CODEX_CLI_PACKAGE = "@openai/codex@latest";
|
|
4
4
|
export type ResolverErrorCode = "COMMAND_NOT_FOUND" | "BUNX_NOT_FOUND" | "BUN_TOO_OLD" | "CUSTOM_TOOL_NOT_FOUND";
|
|
@@ -8,7 +8,7 @@ export interface ResolvedCommand {
|
|
|
8
8
|
usesFallback: boolean;
|
|
9
9
|
env?: NodeJS.ProcessEnv;
|
|
10
10
|
}
|
|
11
|
-
export declare class
|
|
11
|
+
export declare class CodingAgentResolutionError extends Error {
|
|
12
12
|
code: ResolverErrorCode;
|
|
13
13
|
hints?: string[] | undefined;
|
|
14
14
|
constructor(code: ResolverErrorCode, message: string, hints?: string[] | undefined);
|
|
@@ -27,10 +27,10 @@ export interface CodexCommandOptions {
|
|
|
27
27
|
}
|
|
28
28
|
export declare function buildCodexArgs(options?: CodexCommandOptions): string[];
|
|
29
29
|
export declare function resolveCodexCommand(options?: CodexCommandOptions): Promise<ResolvedCommand>;
|
|
30
|
-
export interface
|
|
31
|
-
|
|
30
|
+
export interface CodingAgentCommandOptions extends CodingAgentLaunchOptions {
|
|
31
|
+
agentId: string;
|
|
32
32
|
}
|
|
33
|
-
export declare function
|
|
33
|
+
export declare function resolveCodingAgentCommand(options: CodingAgentCommandOptions): Promise<ResolvedCommand>;
|
|
34
34
|
export declare function isClaudeCodeAvailable(): Promise<boolean>;
|
|
35
35
|
export declare function isCodexAvailable(): Promise<boolean>;
|
|
36
36
|
/**
|
|
@@ -38,4 +38,4 @@ export declare function isCodexAvailable(): Promise<boolean>;
|
|
|
38
38
|
* Not exported in type definitions to avoid production usage.
|
|
39
39
|
*/
|
|
40
40
|
export declare function __resetBunxCacheForTests(): void;
|
|
41
|
-
//# sourceMappingURL=
|
|
41
|
+
//# sourceMappingURL=codingAgentResolver.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codingAgentResolver.d.ts","sourceRoot":"","sources":["../../src/services/codingAgentResolver.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAQlE,eAAO,MAAM,kBAAkB,qCAAqC,CAAC;AACrE,eAAO,MAAM,iBAAiB,yBAAyB,CAAC;AAExD,MAAM,MAAM,iBAAiB,GACzB,mBAAmB,GACnB,gBAAgB,GAChB,aAAa,GACb,uBAAuB,CAAC;AAE5B,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAED,qBAAa,0BAA2B,SAAQ,KAAK;IAE1C,IAAI,EAAE,iBAAiB;IAEvB,KAAK,CAAC,EAAE,MAAM,EAAE;gBAFhB,IAAI,EAAE,iBAAiB,EAC9B,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,MAAM,EAAE,YAAA;CAK1B;AA8FD,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,wBAAgB,eAAe,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAuB5E;AAED,wBAAsB,oBAAoB,CACxC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,eAAe,CAAC,CAqC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,wBAAgB,cAAc,CAAC,OAAO,GAAE,mBAAwB,GAAG,MAAM,EAAE,CAwB1E;AAED,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,eAAe,CAAC,CAgC1B;AAED,MAAM,WAAW,yBAA0B,SAAQ,wBAAwB;IACzE,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,eAAe,CAAC,CA2B1B;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAU9D;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAUzD;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,IAAI,CAE/C"}
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import { execa } from "execa";
|
|
2
2
|
import { platform } from "os";
|
|
3
|
-
import {
|
|
4
|
-
import { CLAUDE_CODE_TOOL } from "../config/builtin-
|
|
5
|
-
import { CODEX_DEFAULT_ARGS, CLAUDE_PERMISSION_SKIP_ARGS, } from "../shared/
|
|
6
|
-
import {
|
|
3
|
+
import { getCodingAgentById } from "../config/tools.js";
|
|
4
|
+
import { CLAUDE_CODE_TOOL } from "../config/builtin-coding-agents.js";
|
|
5
|
+
import { CODEX_DEFAULT_ARGS, CLAUDE_PERMISSION_SKIP_ARGS, } from "../shared/codingAgentConstants.js";
|
|
6
|
+
import { prepareCodingAgentExecution } from "./codingAgentCommandResolver.js";
|
|
7
7
|
import { createLogger } from "../logging/logger.js";
|
|
8
8
|
const logger = createLogger({ category: "resolver" });
|
|
9
9
|
const DETECTION_COMMAND = platform() === "win32" ? "where" : "which";
|
|
10
10
|
const MIN_BUN_MAJOR = 1;
|
|
11
11
|
export const CLAUDE_CLI_PACKAGE = "@anthropic-ai/claude-code@latest";
|
|
12
12
|
export const CODEX_CLI_PACKAGE = "@openai/codex@latest";
|
|
13
|
-
export class
|
|
13
|
+
export class CodingAgentResolutionError extends Error {
|
|
14
14
|
code;
|
|
15
15
|
hints;
|
|
16
16
|
constructor(code, message, hints) {
|
|
17
17
|
super(message);
|
|
18
18
|
this.code = code;
|
|
19
19
|
this.hints = hints;
|
|
20
|
-
this.name = "
|
|
20
|
+
this.name = "CodingAgentResolutionError";
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
async function commandExists(command) {
|
|
@@ -55,7 +55,7 @@ async function ensureBunxAvailable() {
|
|
|
55
55
|
bunxCheckPromise = (async () => {
|
|
56
56
|
const bunxExists = await commandExists("bunx");
|
|
57
57
|
if (!bunxExists) {
|
|
58
|
-
throw new
|
|
58
|
+
throw new CodingAgentResolutionError("BUNX_NOT_FOUND", "bunx command not found. Install Bun 1.0+ so bunx is available on PATH.", [
|
|
59
59
|
"Install Bun: https://bun.sh/docs/installation",
|
|
60
60
|
"After installation, restart your terminal so bunx is on PATH.",
|
|
61
61
|
]);
|
|
@@ -66,24 +66,24 @@ async function ensureBunxAvailable() {
|
|
|
66
66
|
logger.debug({ bunVersion: version }, "Bun version detected");
|
|
67
67
|
const major = parseInt(version.split(".")[0] ?? "0", 10);
|
|
68
68
|
if (!Number.isFinite(major) || major < MIN_BUN_MAJOR) {
|
|
69
|
-
throw new
|
|
69
|
+
throw new CodingAgentResolutionError("BUN_TOO_OLD", `Detected Bun ${version}. Bun ${MIN_BUN_MAJOR}.0+ is required for bunx fallback execution.`, [
|
|
70
70
|
"Upgrade Bun: curl -fsSL https://bun.sh/install | bash",
|
|
71
71
|
"Verify with 'bun --version' (needs >= 1.0)",
|
|
72
72
|
]);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
catch (error) {
|
|
76
|
-
if (error instanceof
|
|
76
|
+
if (error instanceof CodingAgentResolutionError) {
|
|
77
77
|
throw error;
|
|
78
78
|
}
|
|
79
79
|
const err = error;
|
|
80
80
|
if (err?.code === "ENOENT") {
|
|
81
|
-
throw new
|
|
81
|
+
throw new CodingAgentResolutionError("BUNX_NOT_FOUND", "bun command not found while verifying bunx. Install Bun 1.0+ and ensure it is on PATH.", [
|
|
82
82
|
"Install Bun: https://bun.sh/docs/installation",
|
|
83
83
|
"After installation, run 'bun --version' to confirm.",
|
|
84
84
|
]);
|
|
85
85
|
}
|
|
86
|
-
throw new
|
|
86
|
+
throw new CodingAgentResolutionError("BUN_TOO_OLD", `Failed to verify Bun version: ${err?.message ?? "unknown error"}`);
|
|
87
87
|
}
|
|
88
88
|
})();
|
|
89
89
|
}
|
|
@@ -189,21 +189,21 @@ export async function resolveCodexCommand(options = {}) {
|
|
|
189
189
|
usesFallback: true,
|
|
190
190
|
};
|
|
191
191
|
}
|
|
192
|
-
export async function
|
|
193
|
-
const
|
|
194
|
-
if (!
|
|
195
|
-
logger.error({
|
|
196
|
-
throw new
|
|
192
|
+
export async function resolveCodingAgentCommand(options) {
|
|
193
|
+
const agent = await getCodingAgentById(options.agentId);
|
|
194
|
+
if (!agent) {
|
|
195
|
+
logger.error({ agentId: options.agentId }, "Coding agent not found");
|
|
196
|
+
throw new CodingAgentResolutionError("CUSTOM_TOOL_NOT_FOUND", `Coding agent not found: ${options.agentId}`, [
|
|
197
197
|
"Update ~/.gwt/tools.json to include this ID",
|
|
198
|
-
"Reload the Web UI after editing the
|
|
198
|
+
"Reload the Web UI after editing the agents list",
|
|
199
199
|
]);
|
|
200
200
|
}
|
|
201
|
-
const execution = await
|
|
202
|
-
logger.info({
|
|
201
|
+
const execution = await prepareCodingAgentExecution(agent, options);
|
|
202
|
+
logger.info({ agentId: options.agentId, command: execution.command }, "Coding agent command resolved");
|
|
203
203
|
return {
|
|
204
204
|
command: execution.command,
|
|
205
205
|
args: execution.args,
|
|
206
|
-
usesFallback:
|
|
206
|
+
usesFallback: agent.type === "bunx",
|
|
207
207
|
...(execution.env ? { env: execution.env } : {}),
|
|
208
208
|
};
|
|
209
209
|
}
|
|
@@ -213,7 +213,7 @@ export async function isClaudeCodeAvailable() {
|
|
|
213
213
|
return true;
|
|
214
214
|
}
|
|
215
215
|
catch (error) {
|
|
216
|
-
if (error instanceof
|
|
216
|
+
if (error instanceof CodingAgentResolutionError) {
|
|
217
217
|
return false;
|
|
218
218
|
}
|
|
219
219
|
return false;
|
|
@@ -225,7 +225,7 @@ export async function isCodexAvailable() {
|
|
|
225
225
|
return true;
|
|
226
226
|
}
|
|
227
227
|
catch (error) {
|
|
228
|
-
if (error instanceof
|
|
228
|
+
if (error instanceof CodingAgentResolutionError) {
|
|
229
229
|
return false;
|
|
230
230
|
}
|
|
231
231
|
return false;
|
|
@@ -238,4 +238,4 @@ export async function isCodexAvailable() {
|
|
|
238
238
|
export function __resetBunxCacheForTests() {
|
|
239
239
|
bunxCheckPromise = null;
|
|
240
240
|
}
|
|
241
|
-
//# sourceMappingURL=
|
|
241
|
+
//# sourceMappingURL=codingAgentResolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codingAgentResolver.js","sourceRoot":"","sources":["../../src/services/codingAgentResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Shared constants for
|
|
2
|
+
* Shared constants for Coding Agent integrations.
|
|
3
3
|
*
|
|
4
4
|
* These values are consumed by both the CLI (Node) runtime and the Web UI so
|
|
5
5
|
* that command previews, permission flags, and default arguments stay in sync.
|
|
6
6
|
*/
|
|
7
7
|
export declare const CLAUDE_PERMISSION_SKIP_ARGS: readonly ["--dangerously-skip-permissions"];
|
|
8
8
|
export declare const CODEX_DEFAULT_ARGS: readonly ["--enable", "web_search_request", "--model=gpt-5.2-codex", "--sandbox", "workspace-write", "-c", "model_reasoning_effort=high", "-c", "model_reasoning_summaries=detailed", "-c", "sandbox_workspace_write.network_access=true", "-c", "shell_environment_policy.inherit=all", "-c", "shell_environment_policy.ignore_default_excludes=true", "-c", "shell_environment_policy.experimental_use_profile=true"];
|
|
9
|
-
//# sourceMappingURL=
|
|
9
|
+
//# sourceMappingURL=codingAgentConstants.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codingAgentConstants.d.ts","sourceRoot":"","sources":["../../src/shared/codingAgentConstants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,2BAA2B,6CAE9B,CAAC;AAEX,eAAO,MAAM,kBAAkB,yZAkBrB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Shared constants for
|
|
2
|
+
* Shared constants for Coding Agent integrations.
|
|
3
3
|
*
|
|
4
4
|
* These values are consumed by both the CLI (Node) runtime and the Web UI so
|
|
5
5
|
* that command previews, permission flags, and default arguments stay in sync.
|
|
@@ -26,4 +26,4 @@ export const CODEX_DEFAULT_ARGS = [
|
|
|
26
26
|
"-c",
|
|
27
27
|
"shell_environment_policy.experimental_use_profile=true",
|
|
28
28
|
];
|
|
29
|
-
//# sourceMappingURL=
|
|
29
|
+
//# sourceMappingURL=codingAgentConstants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codingAgentConstants.js","sourceRoot":"","sources":["../../src/shared/codingAgentConstants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,gCAAgC;CACxB,CAAC;AAEX,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,UAAU;IACV,oBAAoB;IACpB,uBAAuB;IACvB,WAAW;IACX,iBAAiB;IACjB,IAAI;IACJ,6BAA6B;IAC7B,IAAI;IACJ,oCAAoC;IACpC,IAAI;IACJ,6CAA6C;IAC7C,IAAI;IACJ,sCAAsC;IACtC,IAAI;IACJ,uDAAuD;IACvD,IAAI;IACJ,wDAAwD;CAChD,CAAC"}
|
package/dist/types/api.d.ts
CHANGED
|
@@ -48,12 +48,12 @@ export interface Worktree {
|
|
|
48
48
|
lastToolUsage?: LastToolUsage | null;
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
|
-
*
|
|
51
|
+
* CodingAgentSession - Coding Agent実行セッション
|
|
52
52
|
*/
|
|
53
|
-
export interface
|
|
53
|
+
export interface CodingAgentSession {
|
|
54
54
|
sessionId: string;
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
agentType: "claude-code" | "codex-cli" | "custom";
|
|
56
|
+
agentName?: string | null;
|
|
57
57
|
mode: "normal" | "continue" | "resume";
|
|
58
58
|
worktreePath: string;
|
|
59
59
|
ptyPid?: number | null;
|
|
@@ -65,7 +65,7 @@ export interface AIToolSession {
|
|
|
65
65
|
errorMessage?: string | null;
|
|
66
66
|
}
|
|
67
67
|
/**
|
|
68
|
-
*
|
|
68
|
+
* CodingAgent - カスタム Coding Agent 設定
|
|
69
69
|
*/
|
|
70
70
|
export interface EnvironmentVariable {
|
|
71
71
|
key: string;
|
|
@@ -79,7 +79,7 @@ export interface EnvironmentHistoryEntry {
|
|
|
79
79
|
timestamp: string;
|
|
80
80
|
source: "ui" | "os" | "cli";
|
|
81
81
|
}
|
|
82
|
-
export interface
|
|
82
|
+
export interface ApiCodingAgent {
|
|
83
83
|
id: string;
|
|
84
84
|
displayName: string;
|
|
85
85
|
icon?: string | null;
|
|
@@ -132,14 +132,14 @@ export type BranchResponse = SuccessResponse<Branch>;
|
|
|
132
132
|
export type BranchSyncResponse = SuccessResponse<BranchSyncResult>;
|
|
133
133
|
export type WorktreeListResponse = SuccessResponse<Worktree[]>;
|
|
134
134
|
export type WorktreeResponse = SuccessResponse<Worktree>;
|
|
135
|
-
export type SessionListResponse = SuccessResponse<
|
|
136
|
-
export type SessionResponse = SuccessResponse<
|
|
135
|
+
export type SessionListResponse = SuccessResponse<CodingAgentSession[]>;
|
|
136
|
+
export type SessionResponse = SuccessResponse<CodingAgentSession>;
|
|
137
137
|
export interface ConfigPayload {
|
|
138
138
|
version: string;
|
|
139
139
|
updatedAt?: string | null;
|
|
140
140
|
env?: EnvironmentVariable[] | null;
|
|
141
141
|
history?: EnvironmentHistoryEntry[] | null;
|
|
142
|
-
|
|
142
|
+
codingAgents: ApiCodingAgent[];
|
|
143
143
|
}
|
|
144
144
|
export type ConfigResponse = SuccessResponse<ConfigPayload>;
|
|
145
145
|
/**
|
|
@@ -153,14 +153,14 @@ export interface BranchSyncRequest {
|
|
|
153
153
|
worktreePath: string;
|
|
154
154
|
}
|
|
155
155
|
export interface StartSessionRequest {
|
|
156
|
-
|
|
157
|
-
|
|
156
|
+
agentType: "claude-code" | "codex-cli" | "custom";
|
|
157
|
+
agentName?: string | null;
|
|
158
158
|
mode: "normal" | "continue" | "resume";
|
|
159
159
|
worktreePath: string;
|
|
160
160
|
skipPermissions?: boolean;
|
|
161
161
|
bypassApprovals?: boolean;
|
|
162
162
|
extraArgs?: string[];
|
|
163
|
-
|
|
163
|
+
customAgentId?: string | null;
|
|
164
164
|
}
|
|
165
165
|
export type UpdateConfigRequest = ConfigPayload;
|
|
166
166
|
export interface CleanupResponse {
|
package/dist/types/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/types/api.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC/C,kBAAkB,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE;QACX,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,OAAO,CAAC;KACnB,GAAG,IAAI,CAAC;IACT,MAAM,CAAC,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC;QACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAC1B,GAAG,IAAI,CAAC;IACT,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,aAAa,CAAC,EAAE,aAAa,GAAG,IAAI,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/types/api.ts"],"names":[],"mappings":"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"}
|