agent-tower 0.2.4 → 0.2.6
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/dist/cli.js +3 -2
- package/dist/cli.js.map +1 -1
- package/dist/executors/__tests__/providers.test.d.ts +2 -0
- package/dist/executors/__tests__/providers.test.d.ts.map +1 -0
- package/dist/executors/__tests__/providers.test.js +129 -0
- package/dist/executors/__tests__/providers.test.js.map +1 -0
- package/dist/executors/base.executor.d.ts.map +1 -1
- package/dist/executors/base.executor.js +7 -11
- package/dist/executors/base.executor.js.map +1 -1
- package/dist/executors/claude-code.executor.d.ts +2 -2
- package/dist/executors/claude-code.executor.d.ts.map +1 -1
- package/dist/executors/claude-code.executor.js +1 -1
- package/dist/executors/claude-code.executor.js.map +1 -1
- package/dist/executors/codex.executor.d.ts +9 -1
- package/dist/executors/codex.executor.d.ts.map +1 -1
- package/dist/executors/codex.executor.js +102 -13
- package/dist/executors/codex.executor.js.map +1 -1
- package/dist/executors/default-profiles.json +2 -1
- package/dist/executors/default-providers.json +2 -1
- package/dist/executors/image-utils.d.ts +8 -0
- package/dist/executors/image-utils.d.ts.map +1 -1
- package/dist/executors/image-utils.js +25 -0
- package/dist/executors/image-utils.js.map +1 -1
- package/dist/executors/index.d.ts +1 -1
- package/dist/executors/index.d.ts.map +1 -1
- package/dist/executors/index.js +23 -5
- package/dist/executors/index.js.map +1 -1
- package/dist/executors/providers.d.ts +7 -2
- package/dist/executors/providers.d.ts.map +1 -1
- package/dist/executors/providers.js +120 -1
- package/dist/executors/providers.js.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/output/codex-parser.d.ts +22 -3
- package/dist/output/codex-parser.d.ts.map +1 -1
- package/dist/output/codex-parser.js +106 -11
- package/dist/output/codex-parser.js.map +1 -1
- package/dist/routes/providers.d.ts +3 -0
- package/dist/routes/providers.d.ts.map +1 -1
- package/dist/routes/providers.js +70 -3
- package/dist/routes/providers.js.map +1 -1
- package/dist/routes/workspaces.d.ts.map +1 -1
- package/dist/routes/workspaces.js +1 -0
- package/dist/routes/workspaces.js.map +1 -1
- package/dist/services/terminal-manager.d.ts +1 -1
- package/dist/services/terminal-manager.d.ts.map +1 -1
- package/dist/services/terminal-manager.js +4 -3
- package/dist/services/terminal-manager.js.map +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +2 -2
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/process-launch.d.ts +11 -0
- package/dist/utils/process-launch.d.ts.map +1 -0
- package/dist/utils/process-launch.js +119 -0
- package/dist/utils/process-launch.js.map +1 -0
- package/dist/utils/process-launch.test.d.ts +2 -0
- package/dist/utils/process-launch.test.d.ts.map +1 -0
- package/dist/utils/process-launch.test.js +52 -0
- package/dist/utils/process-launch.test.js.map +1 -0
- package/dist/web/assets/{AgentDemoPage-DbReHEIF.js → AgentDemoPage-DSyU6XMx.js} +1 -1
- package/dist/web/assets/{DemoPage-U0U06JBX.js → DemoPage-BxYQv1Wa.js} +1 -1
- package/dist/web/assets/{NotificationSettingsPage-CdbIEiFm.js → NotificationSettingsPage-mln4lAxn.js} +1 -1
- package/dist/web/assets/{ProfileSettingsPage-DXdb0LKC.js → ProfileSettingsPage-CS-WK307.js} +1 -1
- package/dist/web/assets/{ProjectKanbanPage-DmTUqq3c.js → ProjectKanbanPage-Bz0Q0ZZy.js} +3 -3
- package/dist/web/assets/{ProjectSettingsPage-X9m7tZ5R.js → ProjectSettingsPage-CBnahNua.js} +1 -1
- package/dist/web/assets/ProviderSettingsPage-D-Lrg1Sj.js +54 -0
- package/dist/web/assets/{api-client-DEke6rQ4.js → api-client-iFY2ykuZ.js} +1 -1
- package/dist/web/assets/{chevron-down-CpFVmwPg.js → chevron-down-CxTrrnvp.js} +1 -1
- package/dist/web/assets/{circle-alert-Gs_wxunt.js → circle-alert-CHDHEO67.js} +1 -1
- package/dist/web/assets/{circle-check-BPbbKebL.js → circle-check-uswR_cEa.js} +1 -1
- package/dist/web/assets/{code-block-OCS4YCEC-B9uttJeR.js → code-block-OCS4YCEC-VVSDpKw-.js} +1 -1
- package/dist/web/assets/{folder-picker-q3bDqZNK.js → folder-picker-DshGpYNS.js} +1 -1
- package/dist/web/assets/index-Br9066ZX.css +1 -0
- package/dist/web/assets/{index-yP6NT0d4.js → index-hdGFeHu1.js} +2 -2
- package/dist/web/assets/{loader-circle-BPfuUlPS.js → loader-circle-BYF33K7x.js} +1 -1
- package/dist/web/assets/{mermaid-NOHMQCX5-tkavilGV.js → mermaid-NOHMQCX5-CQLrOBEw.js} +3 -3
- package/dist/web/assets/{modal-Cm1qLsdb.js → modal-BCL0660p.js} +1 -1
- package/dist/web/assets/{pencil-BJvmRaTF.js → pencil-SJi1qbh9.js} +1 -1
- package/dist/web/assets/{query-keys-DfqkAgsV.js → query-keys-B2VhRmAm.js} +1 -1
- package/dist/web/assets/{select-Dchwldvd.js → select-WuDnj3zN.js} +1 -1
- package/dist/web/assets/{use-profiles-DVKFw38N.js → use-profiles-DYTDOkn8.js} +1 -1
- package/dist/web/assets/{use-projects-CYLR7Ikg.js → use-projects-BLI6qXx-.js} +1 -1
- package/dist/web/assets/use-providers-C1i5uxRH.js +1 -0
- package/dist/web/assets/{x-C1fyolLz.js → x-Bn5zgMLL.js} +1 -1
- package/dist/web/index.html +2 -2
- package/node_modules/@agent-tower/shared/dist/types.d.ts +29 -2
- package/node_modules/@agent-tower/shared/dist/types.d.ts.map +1 -1
- package/node_modules/@agent-tower/shared/dist/types.js.map +1 -1
- package/package.json +2 -1
- package/dist/web/assets/ProviderSettingsPage-rrgndhUT.js +0 -1
- package/dist/web/assets/index-Bdp1rkP7.css +0 -1
- package/dist/web/assets/use-providers-Ce2CzdA7.js +0 -1
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
* 将 Codex 的 JSONL 输出转换为标准化日志
|
|
4
4
|
*/
|
|
5
5
|
const DEBUG_PARSER = process.env.DEBUG_PARSER === 'true';
|
|
6
|
-
import { createAssistantMessage, createToolUse, createTokenUsageInfo, } from './types.js';
|
|
7
|
-
import { addNormalizedEntry, updateToolStatus, setSessionId, } from './utils/patch.js';
|
|
6
|
+
import { createAssistantMessage, createToolUse, createTokenUsageInfo, createErrorMessage, } from './types.js';
|
|
7
|
+
import { addNormalizedEntry, updateEntryContent, updateToolStatus, setSessionId, } from './utils/patch.js';
|
|
8
8
|
import { stripAnsiSequences } from './utils/ansi.js';
|
|
9
9
|
/**
|
|
10
10
|
* Codex 解析器
|
|
@@ -15,6 +15,14 @@ export class CodexParser {
|
|
|
15
15
|
currentToolUseId = null;
|
|
16
16
|
currentToolIndex = null;
|
|
17
17
|
toolOutputBuffer = '';
|
|
18
|
+
/** 收集非 JSON 行,用于进程异常退出时作为错误信息 */
|
|
19
|
+
nonJsonLines = [];
|
|
20
|
+
/** 是否已通过 JSON 事件推送过错误(用于 finish 去重) */
|
|
21
|
+
hasJsonError = false;
|
|
22
|
+
/** 已推送的错误消息集合(用于 error / turn.failed 去重) */
|
|
23
|
+
pushedErrors = new Set();
|
|
24
|
+
/** 重试类错误的 entry index(用于原地更新而非创建新条目) */
|
|
25
|
+
retryErrorIndex = null;
|
|
18
26
|
constructor(msgStore) {
|
|
19
27
|
this.msgStore = msgStore;
|
|
20
28
|
}
|
|
@@ -33,27 +41,50 @@ export class CodexParser {
|
|
|
33
41
|
const trimmed = line.trim();
|
|
34
42
|
if (!trimmed)
|
|
35
43
|
continue;
|
|
36
|
-
//
|
|
44
|
+
// 收集非 JSON 行(如 ERROR 日志),用于异常退出时展示
|
|
37
45
|
if (!trimmed.startsWith('{')) {
|
|
46
|
+
this.nonJsonLines.push(stripAnsiSequences(trimmed));
|
|
38
47
|
if (DEBUG_PARSER) {
|
|
39
48
|
console.log('[CodexParser] Skipping non-JSON line:', trimmed.substring(0, 100));
|
|
40
49
|
}
|
|
41
50
|
continue;
|
|
42
51
|
}
|
|
43
|
-
this.
|
|
52
|
+
this.parseJsonSegments(trimmed);
|
|
44
53
|
}
|
|
45
54
|
}
|
|
46
55
|
/**
|
|
47
|
-
*
|
|
56
|
+
* 解析一行中可能包含的多个 JSON 对象
|
|
57
|
+
* Codex 有时会在同一行输出多个 JSON: {"type":"error",...} {"type":"turn.failed",...}
|
|
48
58
|
*/
|
|
49
|
-
|
|
59
|
+
parseJsonSegments(line) {
|
|
60
|
+
// 尝试直接解析整行
|
|
50
61
|
try {
|
|
51
62
|
const event = JSON.parse(line);
|
|
52
63
|
this.handleEvent(event);
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
catch {
|
|
67
|
+
// 可能是多个 JSON 拼接,尝试拆分
|
|
53
68
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
69
|
+
// 按 `} {` 模式拆分(Codex 输出的多 JSON 行以空格分隔)
|
|
70
|
+
const segments = line.split(/\}\s*\{/).map((seg, i, arr) => {
|
|
71
|
+
if (arr.length === 1)
|
|
72
|
+
return seg;
|
|
73
|
+
if (i === 0)
|
|
74
|
+
return seg + '}';
|
|
75
|
+
if (i === arr.length - 1)
|
|
76
|
+
return '{' + seg;
|
|
77
|
+
return '{' + seg + '}';
|
|
78
|
+
});
|
|
79
|
+
for (const segment of segments) {
|
|
80
|
+
try {
|
|
81
|
+
const event = JSON.parse(segment);
|
|
82
|
+
this.handleEvent(event);
|
|
83
|
+
}
|
|
84
|
+
catch (err) {
|
|
85
|
+
if (DEBUG_PARSER) {
|
|
86
|
+
console.error('[CodexParser] Failed to parse JSON segment:', segment.substring(0, 200), err);
|
|
87
|
+
}
|
|
57
88
|
}
|
|
58
89
|
}
|
|
59
90
|
}
|
|
@@ -83,6 +114,12 @@ export class CodexParser {
|
|
|
83
114
|
this.handleUsage(event.usage);
|
|
84
115
|
}
|
|
85
116
|
break;
|
|
117
|
+
case 'error':
|
|
118
|
+
this.handleError(event.message || 'Unknown error');
|
|
119
|
+
break;
|
|
120
|
+
case 'turn.failed':
|
|
121
|
+
this.handleError(event.error?.message || event.message || 'Turn failed');
|
|
122
|
+
break;
|
|
86
123
|
}
|
|
87
124
|
}
|
|
88
125
|
/**
|
|
@@ -144,12 +181,70 @@ export class CodexParser {
|
|
|
144
181
|
const patch = addNormalizedEntry(index, tokenUsage);
|
|
145
182
|
this.msgStore.pushPatch(patch);
|
|
146
183
|
}
|
|
184
|
+
/**
|
|
185
|
+
* 检测是否为重试类消息(如 "Reconnecting... 3/5 (reason)")
|
|
186
|
+
*/
|
|
187
|
+
isRetryMessage(message) {
|
|
188
|
+
return /Reconnecting\.\.\.\s*\d+\/\d+/i.test(message);
|
|
189
|
+
}
|
|
190
|
+
/**
|
|
191
|
+
* 处理错误事件(type: error / turn.failed)
|
|
192
|
+
* - 重试类消息(Reconnecting... N/M):原地更新同一个 entry
|
|
193
|
+
* - 普通错误:去重后创建新 entry
|
|
194
|
+
*/
|
|
195
|
+
handleError(message) {
|
|
196
|
+
this.hasJsonError = true;
|
|
197
|
+
if (this.isRetryMessage(message)) {
|
|
198
|
+
if (this.retryErrorIndex !== null) {
|
|
199
|
+
// 原地更新已有的重试 entry
|
|
200
|
+
const patch = updateEntryContent(this.retryErrorIndex, message);
|
|
201
|
+
this.msgStore.pushPatch(patch);
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
// 第一次重试:创建 entry 并记录 index
|
|
205
|
+
const entry = createErrorMessage(message, message);
|
|
206
|
+
const index = this.indexProvider.next();
|
|
207
|
+
const patch = addNormalizedEntry(index, entry);
|
|
208
|
+
this.msgStore.pushPatch(patch);
|
|
209
|
+
this.retryErrorIndex = index;
|
|
210
|
+
}
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
// 非重试消息:检查是否与最后一次重试的根因相同
|
|
214
|
+
// 如 "Reconnecting... 5/5 (reason)" 之后紧跟 "reason" → 更新而非新建
|
|
215
|
+
if (this.retryErrorIndex !== null) {
|
|
216
|
+
const patch = updateEntryContent(this.retryErrorIndex, message);
|
|
217
|
+
this.msgStore.pushPatch(patch);
|
|
218
|
+
this.retryErrorIndex = null;
|
|
219
|
+
this.pushedErrors.add(message);
|
|
220
|
+
return;
|
|
221
|
+
}
|
|
222
|
+
// 普通去重
|
|
223
|
+
if (this.pushedErrors.has(message))
|
|
224
|
+
return;
|
|
225
|
+
this.pushedErrors.add(message);
|
|
226
|
+
const entry = createErrorMessage(message, message);
|
|
227
|
+
const index = this.indexProvider.next();
|
|
228
|
+
const patch = addNormalizedEntry(index, entry);
|
|
229
|
+
this.msgStore.pushPatch(patch);
|
|
230
|
+
}
|
|
147
231
|
/**
|
|
148
232
|
* 完成解析
|
|
149
233
|
*/
|
|
150
|
-
finish() {
|
|
234
|
+
finish(exitCode) {
|
|
151
235
|
if (this.buffer.trim()) {
|
|
152
|
-
this.
|
|
236
|
+
this.parseJsonSegments(this.buffer);
|
|
237
|
+
}
|
|
238
|
+
// 进程异常退出且没有通过 JSON 事件推送过错误时,才用 nonJsonLines 作为兜底
|
|
239
|
+
const isFailed = typeof exitCode === 'number' && exitCode !== 0;
|
|
240
|
+
if (isFailed && !this.hasJsonError && this.nonJsonLines.length > 0) {
|
|
241
|
+
const errorText = this.nonJsonLines.join('\n').trim();
|
|
242
|
+
if (errorText) {
|
|
243
|
+
const entry = createErrorMessage(`Agent process exited with code ${exitCode}:\n${errorText}`, errorText);
|
|
244
|
+
const index = this.indexProvider.next();
|
|
245
|
+
const patch = addNormalizedEntry(index, entry);
|
|
246
|
+
this.msgStore.pushPatch(patch);
|
|
247
|
+
}
|
|
153
248
|
}
|
|
154
249
|
}
|
|
155
250
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-parser.js","sourceRoot":"","sources":["../../src/output/codex-parser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,CAAC;AAEzD,OAAO,EACL,sBAAsB,EACtB,aAAa,EACb,oBAAoB,
|
|
1
|
+
{"version":3,"file":"codex-parser.js","sourceRoot":"","sources":["../../src/output/codex-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
* Provider CRUD API
|
|
3
3
|
*
|
|
4
4
|
* GET /api/providers — 获取所有 providers(带可用性检查)
|
|
5
|
+
* GET /api/providers/backup — 导出 Provider 备份(仅用户层配置)
|
|
6
|
+
* POST /api/providers/import/preview — 预览导入结果
|
|
7
|
+
* POST /api/providers/import — 执行导入
|
|
5
8
|
* GET /api/providers/:id — 获取单个 provider 详情
|
|
6
9
|
* POST /api/providers — 创建 provider
|
|
7
10
|
* PUT /api/providers/:id — 更新 provider
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/routes/providers.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/routes/providers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AA0E/C,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,iBAkGxD"}
|
package/dist/routes/providers.js
CHANGED
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
* Provider CRUD API
|
|
3
3
|
*
|
|
4
4
|
* GET /api/providers — 获取所有 providers(带可用性检查)
|
|
5
|
+
* GET /api/providers/backup — 导出 Provider 备份(仅用户层配置)
|
|
6
|
+
* POST /api/providers/import/preview — 预览导入结果
|
|
7
|
+
* POST /api/providers/import — 执行导入
|
|
5
8
|
* GET /api/providers/:id — 获取单个 provider 详情
|
|
6
9
|
* POST /api/providers — 创建 provider
|
|
7
10
|
* PUT /api/providers/:id — 更新 provider
|
|
@@ -9,29 +12,93 @@
|
|
|
9
12
|
* POST /api/providers/reload — 重新加载配置
|
|
10
13
|
*/
|
|
11
14
|
import { z } from 'zod';
|
|
12
|
-
import { getProviderById, createProvider, updateProvider, deleteProvider, reloadProviders, getAllProvidersAvailability, } from '../executors/index.js';
|
|
15
|
+
import { getProviderById, createProviderBackup, previewProviderImport, importProvidersFromBackup, createProvider, updateProvider, deleteProvider, reloadProviders, getAllProvidersAvailability, } from '../executors/index.js';
|
|
13
16
|
import { AgentType } from '../types/index.js';
|
|
14
17
|
const createProviderSchema = z.object({
|
|
15
18
|
name: z.string().min(1),
|
|
16
19
|
agentType: z.nativeEnum(AgentType),
|
|
17
20
|
env: z.record(z.string()).default({}),
|
|
18
21
|
config: z.record(z.unknown()).default({}),
|
|
19
|
-
settings: z.
|
|
22
|
+
settings: z.string().optional(),
|
|
20
23
|
isDefault: z.boolean().default(false),
|
|
21
24
|
});
|
|
22
25
|
const updateProviderSchema = z.object({
|
|
23
26
|
name: z.string().min(1).optional(),
|
|
24
27
|
env: z.record(z.string()).optional(),
|
|
25
28
|
config: z.record(z.unknown()).optional(),
|
|
26
|
-
settings: z.
|
|
29
|
+
settings: z.string().optional(),
|
|
27
30
|
isDefault: z.boolean().optional(),
|
|
28
31
|
});
|
|
32
|
+
const backupProviderSchema = z.object({
|
|
33
|
+
id: z.string().min(1),
|
|
34
|
+
name: z.string().min(1),
|
|
35
|
+
agentType: z.nativeEnum(AgentType),
|
|
36
|
+
env: z.record(z.string()).default({}),
|
|
37
|
+
config: z.record(z.unknown()).default({}),
|
|
38
|
+
settings: z.string().optional(),
|
|
39
|
+
isDefault: z.boolean().default(false),
|
|
40
|
+
createdAt: z.string().optional(),
|
|
41
|
+
});
|
|
42
|
+
const providerBackupSchema = z.object({
|
|
43
|
+
version: z.literal(1),
|
|
44
|
+
kind: z.literal('provider-backup'),
|
|
45
|
+
exportedAt: z.string().min(1),
|
|
46
|
+
mode: z.literal('full'),
|
|
47
|
+
providers: z.array(backupProviderSchema),
|
|
48
|
+
}).superRefine((backup, ctx) => {
|
|
49
|
+
const seenIds = new Set();
|
|
50
|
+
backup.providers.forEach((provider, index) => {
|
|
51
|
+
if (seenIds.has(provider.id)) {
|
|
52
|
+
ctx.addIssue({
|
|
53
|
+
code: z.ZodIssueCode.custom,
|
|
54
|
+
message: `Duplicate provider id in backup: ${provider.id}`,
|
|
55
|
+
path: ['providers', index, 'id'],
|
|
56
|
+
});
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
seenIds.add(provider.id);
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
function parseBackupPayload(body) {
|
|
63
|
+
const result = providerBackupSchema.safeParse(body);
|
|
64
|
+
if (!result.success) {
|
|
65
|
+
const message = result.error.issues[0]?.message ?? 'Invalid provider backup payload';
|
|
66
|
+
throw new Error(message);
|
|
67
|
+
}
|
|
68
|
+
return result.data;
|
|
69
|
+
}
|
|
29
70
|
export async function providerRoutes(app) {
|
|
30
71
|
// 获取所有 providers(带可用性检查)
|
|
31
72
|
app.get('/providers', async () => {
|
|
32
73
|
const providersWithAvailability = await getAllProvidersAvailability();
|
|
33
74
|
return providersWithAvailability;
|
|
34
75
|
});
|
|
76
|
+
// 导出 Provider 备份(仅用户层配置)
|
|
77
|
+
app.get('/providers/backup', async () => {
|
|
78
|
+
return createProviderBackup();
|
|
79
|
+
});
|
|
80
|
+
// 预览导入结果
|
|
81
|
+
app.post('/providers/import/preview', async (request, reply) => {
|
|
82
|
+
try {
|
|
83
|
+
const backup = parseBackupPayload(request.body);
|
|
84
|
+
return previewProviderImport(backup);
|
|
85
|
+
}
|
|
86
|
+
catch (e) {
|
|
87
|
+
reply.code(400);
|
|
88
|
+
return { message: e instanceof Error ? e.message : 'Failed to preview provider import' };
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
// 执行导入
|
|
92
|
+
app.post('/providers/import', async (request, reply) => {
|
|
93
|
+
try {
|
|
94
|
+
const backup = parseBackupPayload(request.body);
|
|
95
|
+
return importProvidersFromBackup(backup);
|
|
96
|
+
}
|
|
97
|
+
catch (e) {
|
|
98
|
+
reply.code(400);
|
|
99
|
+
return { message: e instanceof Error ? e.message : 'Failed to import providers' };
|
|
100
|
+
}
|
|
101
|
+
});
|
|
35
102
|
// 获取单个 provider 详情
|
|
36
103
|
app.get('/providers/:id', async (request, reply) => {
|
|
37
104
|
const provider = getProviderById(request.params.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../src/routes/providers.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../src/routes/providers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../src/routes/workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAsD/C,wBAAsB,eAAe,CAAC,GAAG,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../src/routes/workspaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAsD/C,wBAAsB,eAAe,CAAC,GAAG,EAAE,eAAe,iBAqMzD"}
|
|
@@ -144,6 +144,7 @@ export async function workspaceRoutes(app) {
|
|
|
144
144
|
const command = resolveEditorCommand(body.editorType);
|
|
145
145
|
spawn(command, [workspace.worktreePath], {
|
|
146
146
|
detached: true,
|
|
147
|
+
shell: process.platform === 'win32',
|
|
147
148
|
stdio: 'ignore',
|
|
148
149
|
}).unref();
|
|
149
150
|
return { success: true };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../src/routes/workspaces.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../src/routes/workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export interface TerminalInfo {
|
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
13
13
|
* Manages standalone interactive shell terminals.
|
|
14
|
-
* Each terminal is a raw PTY (
|
|
14
|
+
* Each terminal is a raw PTY (zsh/cmd 等系统默认 shell) with no parser or MsgStore.
|
|
15
15
|
* Terminals are owned by the socket that created them.
|
|
16
16
|
*/
|
|
17
17
|
export declare class TerminalManager {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-manager.d.ts","sourceRoot":"","sources":["../../src/services/terminal-manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-manager.d.ts","sourceRoot":"","sources":["../../src/services/terminal-manager.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAmCrD,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb;AAMD;;;;GAIG;AACH,qBAAa,eAAe;IAKd,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAJrC,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,QAAQ,CAA+C;gBAElC,QAAQ,EAAE,QAAQ;IAQ/C;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,YAAY;IAiE3E;;OAEG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAO7C;;OAEG;IACH,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAO5D;;OAEG;IACH,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAqBjC;;;OAGG;IACH,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAcvC;;OAEG;IACH,UAAU,IAAI,IAAI;IAalB;;OAEG;IACH,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAIhC;;OAEG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAMD,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,cAAc;IAgBtB;;OAEG;IACH,OAAO,CAAC,eAAe;CAgBxB"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import * as pty from 'node-pty';
|
|
2
2
|
import { randomUUID } from 'crypto';
|
|
3
|
+
import { getDefaultTerminalShell } from '../utils/process-launch.js';
|
|
3
4
|
// ============================================================
|
|
4
5
|
// Constants
|
|
5
6
|
// ============================================================
|
|
6
7
|
const MAX_TERMINALS_PER_SOCKET = 50;
|
|
7
8
|
const TERMINAL_TTL_MS = 30 * 60 * 1000; // 30 minutes idle timeout
|
|
8
9
|
const TTL_CHECK_INTERVAL_MS = 60 * 1000; // check every 60 seconds
|
|
9
|
-
const
|
|
10
|
+
const DEFAULT_TERMINAL_SHELL = getDefaultTerminalShell();
|
|
10
11
|
/** agent-tower 内部注入的环境变量,不应泄漏到用户终端 */
|
|
11
12
|
const INTERNAL_ENV_KEYS = ['AGENT_TOWER_DATABASE_URL', 'AGENT_TOWER_DATA_DIR', 'AGENT_TOWER_WEB_DIR'];
|
|
12
13
|
function cleanInternalEnv(env) {
|
|
@@ -21,7 +22,7 @@ function cleanInternalEnv(env) {
|
|
|
21
22
|
// ============================================================
|
|
22
23
|
/**
|
|
23
24
|
* Manages standalone interactive shell terminals.
|
|
24
|
-
* Each terminal is a raw PTY (
|
|
25
|
+
* Each terminal is a raw PTY (zsh/cmd 等系统默认 shell) with no parser or MsgStore.
|
|
25
26
|
* Terminals are owned by the socket that created them.
|
|
26
27
|
*/
|
|
27
28
|
export class TerminalManager {
|
|
@@ -50,7 +51,7 @@ export class TerminalManager {
|
|
|
50
51
|
const cols = options.cols ?? 120;
|
|
51
52
|
const rows = options.rows ?? 30;
|
|
52
53
|
const cwd = options.cwd || process.cwd();
|
|
53
|
-
const shell = pty.spawn(
|
|
54
|
+
const shell = pty.spawn(DEFAULT_TERMINAL_SHELL.command, DEFAULT_TERMINAL_SHELL.args, {
|
|
54
55
|
name: 'xterm-256color',
|
|
55
56
|
cols,
|
|
56
57
|
rows,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-manager.js","sourceRoot":"","sources":["../../src/services/terminal-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAGhC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-manager.js","sourceRoot":"","sources":["../../src/services/terminal-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AAIjC,eAAO,MAAM,MAAM,+GAAqB,CAAC;AAEzC,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAK7C;AAED;;;GAGG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQnE"}
|
package/dist/utils/index.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import pkg from '@prisma/client';
|
|
2
|
+
import { normalizeCommandLookupOutput } from './process-launch.js';
|
|
2
3
|
const { PrismaClient } = pkg;
|
|
3
4
|
export const prisma = new PrismaClient();
|
|
4
5
|
export async function execAsync(command) {
|
|
@@ -15,8 +16,7 @@ export async function which(command) {
|
|
|
15
16
|
try {
|
|
16
17
|
const whichCmd = process.platform === 'win32' ? 'where' : 'which';
|
|
17
18
|
const { stdout } = await execAsync(`${whichCmd} ${command}`);
|
|
18
|
-
|
|
19
|
-
return path || null;
|
|
19
|
+
return normalizeCommandLookupOutput(stdout);
|
|
20
20
|
}
|
|
21
21
|
catch {
|
|
22
22
|
return null;
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC;AAE7B,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,OAAe;IAEf,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IAC/C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAAe;IACzC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,QAAQ,IAAI,OAAO,EAAE,CAAC,CAAC;QAC7D,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC;AAE7B,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,OAAe;IAEf,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IAC/C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CAAC,OAAe;IACzC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,QAAQ,IAAI,OAAO,EAAE,CAAC,CAAC;QAC7D,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export interface CommandInvocation {
|
|
2
|
+
command: string;
|
|
3
|
+
args: string[];
|
|
4
|
+
}
|
|
5
|
+
export declare function getBundledPrismaCommand(moduleDir: string): CommandInvocation;
|
|
6
|
+
export declare function buildPtyCommand(programPath: string, args: string[]): CommandInvocation;
|
|
7
|
+
export declare function buildPtyCommandWithStdin(programPath: string, args: string[], stdinFile: string): CommandInvocation;
|
|
8
|
+
export declare function getDefaultTerminalShell(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): CommandInvocation;
|
|
9
|
+
export declare function getPtyLogFilePath(tmpDir?: string): string;
|
|
10
|
+
export declare function normalizeCommandLookupOutput(stdout: string): string | null;
|
|
11
|
+
//# sourceMappingURL=process-launch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-launch.d.ts","sourceRoot":"","sources":["../../src/utils/process-launch.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAgFD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAK5E;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAKtF;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,EAAE,MAAM,GAChB,iBAAiB,CAKnB;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,iBAAiB,CAYnB;AAED,wBAAgB,iBAAiB,CAAC,MAAM,GAAE,MAAoB,GAAG,MAAM,CAEtE;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK1E"}
|