@chainingintention/pi-web-cn 1.202608.12 → 1.202608.14
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/server/managementEmbed.js +7 -2
- package/dist/server/managementEmbed.js.map +1 -1
- package/dist/server/sessions/piSessionService.js +2 -0
- package/dist/server/sessions/piSessionService.js.map +1 -1
- package/dist/server/sessions/projectSettingsScope.js +84 -21
- package/dist/server/sessions/projectSettingsScope.js.map +1 -1
- package/dist/server/workbench/gatewayIntegration.js +41 -10
- package/dist/server/workbench/gatewayIntegration.js.map +1 -1
- package/dist/server/workbench/mcpClient.js +39 -7
- package/dist/server/workbench/mcpClient.js.map +1 -1
- package/dist/server/workbench/workbenchTools.js +15 -1
- package/dist/server/workbench/workbenchTools.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,6 +11,9 @@ export const SESSION_PREFERENCE_KEYS = [
|
|
|
11
11
|
"defaultModel",
|
|
12
12
|
];
|
|
13
13
|
const SESSION_PREFERENCE_KEY_SET = new Set(SESSION_PREFERENCE_KEYS);
|
|
14
|
+
const NORMAL_PROJECT_SETTING_KEYS = [...SESSION_PREFERENCE_KEYS, "enabledModels"];
|
|
15
|
+
const NORMAL_PROJECT_SETTING_KEY_SET = new Set(NORMAL_PROJECT_SETTING_KEYS);
|
|
16
|
+
const SHARED_HIDDEN_SETTING_KEYS = new Set(["enabledModels"]);
|
|
14
17
|
/**
|
|
15
18
|
* Directory that owns preference overrides for a registered project.
|
|
16
19
|
* Normal mode co-locates with project auth/models under projects/<hash>/.
|
|
@@ -49,11 +52,12 @@ export function legacyScopedSettingsFilePath(scopeDirectory) {
|
|
|
49
52
|
*/
|
|
50
53
|
export async function createScopedSettingsManager(options) {
|
|
51
54
|
await mkdir(options.scopeDirectory, { recursive: true, mode: 0o700 });
|
|
52
|
-
migrateLegacyPreferenceOverrides(options.scopeDirectory);
|
|
55
|
+
migrateLegacyPreferenceOverrides(options.scopeDirectory, options.mode);
|
|
53
56
|
return SettingsManager.fromStorage(new PreferenceOverrideSettingsStorage({
|
|
54
57
|
cwd: options.cwd,
|
|
55
58
|
globalAgentDir: options.globalAgentDir,
|
|
56
59
|
scopeDirectory: options.scopeDirectory,
|
|
60
|
+
mode: options.mode,
|
|
57
61
|
}));
|
|
58
62
|
}
|
|
59
63
|
export function projectPathKey(projectPath) {
|
|
@@ -87,14 +91,20 @@ class PreferenceOverrideSettingsStorage {
|
|
|
87
91
|
this.agentSettingsPath = join(resolve(options.globalAgentDir), "settings.json");
|
|
88
92
|
this.scopeDirectory = resolve(options.scopeDirectory);
|
|
89
93
|
this.preferencesPath = preferencesFilePath(this.scopeDirectory);
|
|
94
|
+
this.mode = options.mode;
|
|
90
95
|
}
|
|
91
96
|
withLock(scope, fn) {
|
|
92
97
|
if (scope === "project") {
|
|
93
|
-
|
|
98
|
+
if (this.mode === "management") {
|
|
99
|
+
this.withManagementFileLock(this.projectSettingsPath, fn);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
this.withFileLock(this.projectSettingsPath, fn);
|
|
103
|
+
}
|
|
94
104
|
return;
|
|
95
105
|
}
|
|
96
106
|
const agentRaw = readTextFileIfExists(this.agentSettingsPath);
|
|
97
|
-
const preferences = readPreferenceOverrides(this.scopeDirectory);
|
|
107
|
+
const preferences = readPreferenceOverrides(this.scopeDirectory, this.mode);
|
|
98
108
|
let current;
|
|
99
109
|
if (agentRaw === undefined && Object.keys(preferences).length === 0) {
|
|
100
110
|
current = undefined;
|
|
@@ -102,7 +112,7 @@ class PreferenceOverrideSettingsStorage {
|
|
|
102
112
|
else {
|
|
103
113
|
try {
|
|
104
114
|
const agentSettings = agentRaw === undefined ? {} : parseSettingsObject(agentRaw);
|
|
105
|
-
current = `${JSON.stringify({ ...agentSettings, ...preferences }, null, 2)}\n`;
|
|
115
|
+
current = `${JSON.stringify({ ...settingsVisibleToSession(agentSettings), ...preferences }, null, 2)}\n`;
|
|
106
116
|
}
|
|
107
117
|
catch {
|
|
108
118
|
// Preserve parse errors for SettingsManager when the real agent file is invalid.
|
|
@@ -127,25 +137,48 @@ class PreferenceOverrideSettingsStorage {
|
|
|
127
137
|
// SettingsManager persists the full effective object. Only keep preference
|
|
128
138
|
// keys that actually diverge from the real agent baseline so unrelated
|
|
129
139
|
// writes cannot pin shared defaults into the override file.
|
|
130
|
-
const nextPreferences = preferenceOverridesAgainstBaseline(
|
|
131
|
-
const existingPreferences = readPreferenceOverrides(this.scopeDirectory);
|
|
140
|
+
const nextPreferences = preferenceOverridesAgainstBaseline(pickScopedOverrides(nextSettings, this.mode), pickPreferenceOverrides(agentSettings), this.mode);
|
|
141
|
+
const existingPreferences = readPreferenceOverrides(this.scopeDirectory, this.mode);
|
|
132
142
|
if (!stableJsonEqual(existingPreferences, nextPreferences)) {
|
|
133
143
|
writeJsonFile(this.preferencesPath, nextPreferences);
|
|
134
144
|
}
|
|
135
|
-
const nextSharedSettings =
|
|
145
|
+
const nextSharedSettings = settingsVisibleToSession(omitScopedKeys(nextSettings, this.mode));
|
|
136
146
|
// Invalid agent settings are left for SettingsManager diagnostics on read.
|
|
137
147
|
// Avoid clobbering a corrupt file during a preference-only write.
|
|
138
148
|
if (agentSettingsParseFailed && Object.keys(nextSharedSettings).length === 0)
|
|
139
149
|
return;
|
|
140
|
-
const existingSharedSettings =
|
|
150
|
+
const existingSharedSettings = settingsVisibleToSession(omitScopedKeys(agentSettings, this.mode));
|
|
141
151
|
// Only rewrite the shared agent file when a non-preference key actually changed.
|
|
142
152
|
if (stableJsonEqual(existingSharedSettings, nextSharedSettings))
|
|
143
153
|
return;
|
|
144
154
|
writeJsonFile(this.agentSettingsPath, {
|
|
145
155
|
...pickPreferenceOverrides(agentSettings),
|
|
156
|
+
...hiddenSharedSettings(agentSettings),
|
|
146
157
|
...nextSharedSettings,
|
|
147
158
|
});
|
|
148
159
|
}
|
|
160
|
+
withManagementFileLock(path, fn) {
|
|
161
|
+
const storedRaw = readTextFileIfExists(path);
|
|
162
|
+
let storedSettings = {};
|
|
163
|
+
let current = storedRaw;
|
|
164
|
+
if (storedRaw !== undefined) {
|
|
165
|
+
try {
|
|
166
|
+
storedSettings = parseSettingsObject(storedRaw);
|
|
167
|
+
current = `${JSON.stringify(settingsVisibleToSession(storedSettings), null, 2)}\n`;
|
|
168
|
+
}
|
|
169
|
+
catch {
|
|
170
|
+
// Preserve parse errors for SettingsManager instead of masking an invalid file.
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
const next = fn(current);
|
|
174
|
+
if (next === undefined)
|
|
175
|
+
return;
|
|
176
|
+
const nextSettings = parseSettingsObject(next);
|
|
177
|
+
writeJsonFile(path, {
|
|
178
|
+
...hiddenSharedSettings(storedSettings),
|
|
179
|
+
...settingsVisibleToSession(nextSettings),
|
|
180
|
+
});
|
|
181
|
+
}
|
|
149
182
|
withFileLock(path, fn) {
|
|
150
183
|
const current = readTextFileIfExists(path);
|
|
151
184
|
const next = fn(current);
|
|
@@ -154,10 +187,10 @@ class PreferenceOverrideSettingsStorage {
|
|
|
154
187
|
writeTextFile(path, next.endsWith("\n") ? next : `${next}\n`);
|
|
155
188
|
}
|
|
156
189
|
}
|
|
157
|
-
export function migrateLegacyPreferenceOverrides(scopeDirectory) {
|
|
190
|
+
export function migrateLegacyPreferenceOverrides(scopeDirectory, mode) {
|
|
158
191
|
const preferencesPath = preferencesFilePath(scopeDirectory);
|
|
159
192
|
if (existsSync(preferencesPath)) {
|
|
160
|
-
return readPreferenceOverridesFromPath(preferencesPath);
|
|
193
|
+
return readPreferenceOverridesFromPath(preferencesPath, mode);
|
|
161
194
|
}
|
|
162
195
|
const legacyPath = legacyScopedSettingsFilePath(scopeDirectory);
|
|
163
196
|
const legacyRaw = readTextFileIfExists(legacyPath);
|
|
@@ -170,25 +203,25 @@ export function migrateLegacyPreferenceOverrides(scopeDirectory) {
|
|
|
170
203
|
catch {
|
|
171
204
|
return {};
|
|
172
205
|
}
|
|
173
|
-
const migrated =
|
|
206
|
+
const migrated = pickScopedOverrides(legacySettings, mode);
|
|
174
207
|
if (Object.keys(migrated).length > 0) {
|
|
175
208
|
writeJsonFile(preferencesPath, migrated);
|
|
176
209
|
}
|
|
177
210
|
return migrated;
|
|
178
211
|
}
|
|
179
|
-
function readPreferenceOverrides(scopeDirectory) {
|
|
212
|
+
function readPreferenceOverrides(scopeDirectory, mode) {
|
|
180
213
|
const preferencesPath = preferencesFilePath(scopeDirectory);
|
|
181
214
|
if (existsSync(preferencesPath)) {
|
|
182
|
-
return readPreferenceOverridesFromPath(preferencesPath);
|
|
215
|
+
return readPreferenceOverridesFromPath(preferencesPath, mode);
|
|
183
216
|
}
|
|
184
|
-
return migrateLegacyPreferenceOverrides(scopeDirectory);
|
|
217
|
+
return migrateLegacyPreferenceOverrides(scopeDirectory, mode);
|
|
185
218
|
}
|
|
186
|
-
function readPreferenceOverridesFromPath(preferencesPath) {
|
|
219
|
+
function readPreferenceOverridesFromPath(preferencesPath, mode) {
|
|
187
220
|
const raw = readTextFileIfExists(preferencesPath);
|
|
188
221
|
if (raw === undefined)
|
|
189
222
|
return {};
|
|
190
223
|
try {
|
|
191
|
-
return
|
|
224
|
+
return pickScopedOverrides(parseSettingsObject(raw), mode);
|
|
192
225
|
}
|
|
193
226
|
catch {
|
|
194
227
|
return {};
|
|
@@ -203,12 +236,24 @@ function pickPreferenceOverrides(settings) {
|
|
|
203
236
|
}
|
|
204
237
|
return picked;
|
|
205
238
|
}
|
|
206
|
-
function
|
|
239
|
+
function pickScopedOverrides(settings, mode) {
|
|
240
|
+
if (mode === "management")
|
|
241
|
+
return pickPreferenceOverrides(settings);
|
|
242
|
+
const picked = {};
|
|
243
|
+
for (const key of NORMAL_PROJECT_SETTING_KEYS) {
|
|
244
|
+
if (Object.prototype.hasOwnProperty.call(settings, key) && settings[key] !== undefined) {
|
|
245
|
+
picked[key] = settings[key];
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
return picked;
|
|
249
|
+
}
|
|
250
|
+
function preferenceOverridesAgainstBaseline(nextPreferences, agentPreferences, mode) {
|
|
207
251
|
const overrides = {};
|
|
208
|
-
|
|
252
|
+
const keys = mode === "normal" ? NORMAL_PROJECT_SETTING_KEYS : SESSION_PREFERENCE_KEYS;
|
|
253
|
+
for (const key of keys) {
|
|
209
254
|
if (!Object.prototype.hasOwnProperty.call(nextPreferences, key))
|
|
210
255
|
continue;
|
|
211
|
-
if (Object.prototype.hasOwnProperty.call(agentPreferences, key) &&
|
|
256
|
+
if (Object.prototype.hasOwnProperty.call(agentPreferences, key) && JSON.stringify(agentPreferences[key]) === JSON.stringify(nextPreferences[key])) {
|
|
212
257
|
continue;
|
|
213
258
|
}
|
|
214
259
|
overrides[key] = nextPreferences[key];
|
|
@@ -218,15 +263,33 @@ function preferenceOverridesAgainstBaseline(nextPreferences, agentPreferences) {
|
|
|
218
263
|
function stableJsonEqual(left, right) {
|
|
219
264
|
return JSON.stringify(left) === JSON.stringify(right);
|
|
220
265
|
}
|
|
221
|
-
function
|
|
266
|
+
function omitScopedKeys(settings, mode) {
|
|
222
267
|
const omitted = {};
|
|
268
|
+
const scopedKeys = mode === "normal" ? NORMAL_PROJECT_SETTING_KEY_SET : SESSION_PREFERENCE_KEY_SET;
|
|
223
269
|
for (const [key, value] of Object.entries(settings)) {
|
|
224
|
-
if (
|
|
270
|
+
if (scopedKeys.has(key) || value === undefined)
|
|
225
271
|
continue;
|
|
226
272
|
omitted[key] = value;
|
|
227
273
|
}
|
|
228
274
|
return omitted;
|
|
229
275
|
}
|
|
276
|
+
function settingsVisibleToSession(settings) {
|
|
277
|
+
const visible = {};
|
|
278
|
+
for (const [key, value] of Object.entries(settings)) {
|
|
279
|
+
if (!SHARED_HIDDEN_SETTING_KEYS.has(key))
|
|
280
|
+
visible[key] = value;
|
|
281
|
+
}
|
|
282
|
+
return visible;
|
|
283
|
+
}
|
|
284
|
+
function hiddenSharedSettings(settings) {
|
|
285
|
+
const hidden = {};
|
|
286
|
+
for (const key of SHARED_HIDDEN_SETTING_KEYS) {
|
|
287
|
+
if (Object.prototype.hasOwnProperty.call(settings, key) && settings[key] !== undefined) {
|
|
288
|
+
hidden[key] = settings[key];
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
return hidden;
|
|
292
|
+
}
|
|
230
293
|
function parseSettingsObject(raw) {
|
|
231
294
|
const parsed = JSON.parse(raw);
|
|
232
295
|
if (!isJsonObject(parsed))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSettingsScope.js","sourceRoot":"","sources":["../../../src/server/sessions/projectSettingsScope.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"projectSettingsScope.js","sourceRoot":"","sources":["../../../src/server/sessions/projectSettingsScope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAWlE,iFAAiF;AACjF,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,sBAAsB;IACtB,iBAAiB;IACjB,cAAc;CACN,CAAC;AAEX,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAS,uBAAuB,CAAC,CAAC;AAC5E,MAAM,2BAA2B,GAAG,CAAC,GAAG,uBAAuB,EAAE,eAAe,CAAU,CAAC;AAC3F,MAAM,8BAA8B,GAAG,IAAI,GAAG,CAAS,2BAA2B,CAAC,CAAC;AACpF,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAS,CAAC,eAAe,CAAC,CAAC,CAAC;AAEtE;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,OAAe,EAAE,WAAmB,EAAE,IAAyB;IAC3G,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,SAAS,CAAC;IACtF,MAAM,UAAU,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IAC/C,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AAC5E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iCAAiC,CAAC,OAAe,EAAE,GAAW;IAC5E,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACnC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC;AAED,2DAA2D;AAC3D,MAAM,UAAU,mBAAmB,CAAC,cAAsB;IACxD,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,2BAA2B,CAAC,CAAC;AACpE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAAC,cAAsB;IACjE,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,eAAe,CAAC,CAAC;AACxD,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OAKjD;IACC,MAAM,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtE,gCAAgC,CAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,OAAO,eAAe,CAAC,WAAW,CAAC,IAAI,iCAAiC,CAAC;QACvE,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,WAAmB;IAChD,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9F,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,6BAA6B,CAAC,OAK7C;IACC,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACtC,OAAO,6BAA6B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAClC,OAAO,iCAAiC,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACzE,CAAC;IACD,4EAA4E;IAC5E,2EAA2E;IAC3E,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAC9F,CAAC;AAED;;;GAGG;AACH,MAAM,iCAAiC;IAOrC,YAAY,OAAmG;QAC7G,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;QACxF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,eAAe,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACtD,IAAI,CAAC,eAAe,GAAG,mBAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAChE,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,QAAQ,CAAC,KAA2B,EAAE,EAAuD;QAC3F,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC/B,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YAClD,CAAC;YACD,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,uBAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,OAA2B,CAAC;QAChC,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpE,OAAO,GAAG,SAAS,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBAClF,OAAO,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,wBAAwB,CAAC,aAAa,CAAC,EAAE,GAAG,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;YAC3G,CAAC;YAAC,MAAM,CAAC;gBACP,iFAAiF;gBACjF,OAAO,GAAG,QAAQ,CAAC;YACrB,CAAC;QACH,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO;QAE/B,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,aAAa,GAA4B,EAAE,CAAC;QAChD,IAAI,wBAAwB,GAAG,KAAK,CAAC;QACrC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAChD,CAAC;YAAC,MAAM,CAAC;gBACP,wBAAwB,GAAG,IAAI,CAAC;gBAChC,aAAa,GAAG,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;QAED,2EAA2E;QAC3E,uEAAuE;QACvE,4DAA4D;QAC5D,MAAM,eAAe,GAAG,kCAAkC,CACxD,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,EAC5C,uBAAuB,CAAC,aAAa,CAAC,EACtC,IAAI,CAAC,IAAI,CACV,CAAC;QACF,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,eAAe,CAAC,mBAAmB,EAAE,eAAe,CAAC,EAAE,CAAC;YAC3D,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7F,2EAA2E;QAC3E,kEAAkE;QAClE,IAAI,wBAAwB,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAErF,MAAM,sBAAsB,GAAG,wBAAwB,CAAC,cAAc,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAClG,iFAAiF;QACjF,IAAI,eAAe,CAAC,sBAAsB,EAAE,kBAAkB,CAAC;YAAE,OAAO;QACxE,aAAa,CAAC,IAAI,CAAC,iBAAiB,EAAE;YACpC,GAAG,uBAAuB,CAAC,aAAa,CAAC;YACzC,GAAG,oBAAoB,CAAC,aAAa,CAAC;YACtC,GAAG,kBAAkB;SACtB,CAAC,CAAC;IACL,CAAC;IAEO,sBAAsB,CAAC,IAAY,EAAE,EAAuD;QAClG,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,cAAc,GAA4B,EAAE,CAAC;QACjD,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,cAAc,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;gBAChD,OAAO,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;YACrF,CAAC;YAAC,MAAM,CAAC;gBACP,gFAAgF;YAClF,CAAC;QACH,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO;QAC/B,MAAM,YAAY,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC/C,aAAa,CAAC,IAAI,EAAE;YAClB,GAAG,oBAAoB,CAAC,cAAc,CAAC;YACvC,GAAG,wBAAwB,CAAC,YAAY,CAAC;SAC1C,CAAC,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,IAAY,EAAE,EAAuD;QACxF,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO;QAC/B,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;IAChE,CAAC;CACF;AAED,MAAM,UAAU,gCAAgC,CAAC,cAAsB,EAAE,IAAyB;IAChG,MAAM,eAAe,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAC5D,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChC,OAAO,+BAA+B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,UAAU,GAAG,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAEvC,IAAI,cAAuC,CAAC;IAC5C,IAAI,CAAC;QACH,cAAc,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAC3D,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrC,aAAa,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,uBAAuB,CAAC,cAAsB,EAAE,IAAyB;IAChF,MAAM,eAAe,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAC5D,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChC,OAAO,+BAA+B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,gCAAgC,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,+BAA+B,CAAC,eAAuB,EAAE,IAAyB;IACzF,MAAM,GAAG,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;IAClD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACjC,IAAI,CAAC;QACH,OAAO,mBAAmB,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAiC;IAChE,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,uBAAuB,EAAE,CAAC;QAC1C,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YACvF,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAID,SAAS,mBAAmB,CAAC,QAAiC,EAAE,IAAyB;IACvF,IAAI,IAAI,KAAK,YAAY;QAAE,OAAO,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACpE,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,2BAA2B,EAAE,CAAC;QAC9C,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YACvF,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,kCAAkC,CACzC,eAAwC,EACxC,gBAAyC,EACzC,IAAyB;IAEzB,MAAM,SAAS,GAA4B,EAAE,CAAC;IAC9C,MAAM,IAAI,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,2BAA2B,CAAC,CAAC,CAAC,uBAAuB,CAAC;IACvF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC;YAAE,SAAS;QAC1E,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAClJ,SAAS;QACX,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,eAAe,CAAC,IAA6B,EAAE,KAA8B;IACpF,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,cAAc,CAAC,QAAiC,EAAE,IAAyB;IAClF,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,0BAA0B,CAAC;IACnG,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,SAAS;YAAE,SAAS;QACzD,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,wBAAwB,CAAC,QAAiC;IACjE,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACjE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAiC;IAC7D,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,GAAG,IAAI,0BAA0B,EAAE,CAAC;QAC7C,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YACvF,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,GAAW;IACtC,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACvE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY;IACxC,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC;YAAE,OAAO,SAAS,CAAC;QACnD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,KAA8B;IACjE,aAAa,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,QAAgB;IACnD,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,uFAAuF;IACvF,MAAM,qBAAqB,GAAG,GAAG,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACzF,aAAa,CAAC,qBAAqB,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,UAAU,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAmB;IAC/C,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACxC,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;AAC9E,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,IAAY;IAC/C,OAAO,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;AAC1E,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { WORKBENCH_ACCESS_STATE_ROUTE } from "./accessStateRoutes.js";
|
|
|
4
4
|
export function createWorkbenchManagementRuntime(base, config, daemon) {
|
|
5
5
|
if (base === undefined || config === undefined)
|
|
6
6
|
return base;
|
|
7
|
-
const
|
|
7
|
+
const contextBindings = new WeakMap();
|
|
8
8
|
const bindings = new Map();
|
|
9
9
|
const client = new WorkbenchClient({ baseUrl: config.baseUrl, requestTimeoutMs: config.requestTimeoutMs ?? 10_000 });
|
|
10
10
|
return {
|
|
@@ -24,31 +24,62 @@ export function createWorkbenchManagementRuntime(base, config, daemon) {
|
|
|
24
24
|
const created = { expiresAt: expiryTime(context.expiresAt), pending };
|
|
25
25
|
cached = created;
|
|
26
26
|
bindings.set(key, created);
|
|
27
|
-
void pending.then((
|
|
27
|
+
void pending.then(() => undefined, () => { if (bindings.get(key) === created)
|
|
28
28
|
bindings.delete(key); });
|
|
29
29
|
}
|
|
30
30
|
const binding = await cached.pending;
|
|
31
|
-
|
|
31
|
+
contextBindings.set(context, binding);
|
|
32
32
|
return context;
|
|
33
33
|
},
|
|
34
|
+
async prepareContext(context) {
|
|
35
|
+
const binding = contextBindings.get(context);
|
|
36
|
+
if (binding !== undefined)
|
|
37
|
+
await refreshExpiredWorkbenchBinding(client, daemon, binding);
|
|
38
|
+
},
|
|
34
39
|
resourceHandle(context) {
|
|
35
|
-
return
|
|
40
|
+
return contextBindings.get(context)?.handle;
|
|
36
41
|
},
|
|
37
42
|
};
|
|
38
43
|
}
|
|
39
44
|
async function createWorkbenchBinding(client, daemon, token, projectId, entryExpiresAt) {
|
|
40
45
|
const state = await client.createAgentAccessState(token, projectId);
|
|
41
46
|
const handle = randomBytes(32).toString("base64url");
|
|
42
|
-
|
|
43
|
-
if (response.statusCode !== 204) {
|
|
44
|
-
await client.revoke(state).catch(() => undefined);
|
|
45
|
-
throw new Error("Session daemon rejected the workbench resource state");
|
|
46
|
-
}
|
|
47
|
+
await storeWorkbenchState(client, daemon, handle, state);
|
|
47
48
|
return {
|
|
48
49
|
handle,
|
|
49
|
-
|
|
50
|
+
bootstrapToken: token,
|
|
51
|
+
projectId,
|
|
52
|
+
entryExpiresAt: expiryTime(entryExpiresAt),
|
|
53
|
+
state,
|
|
50
54
|
};
|
|
51
55
|
}
|
|
56
|
+
async function refreshExpiredWorkbenchBinding(client, daemon, binding) {
|
|
57
|
+
const now = Date.now();
|
|
58
|
+
if (expiryTime(binding.state.expiresAt) > now)
|
|
59
|
+
return;
|
|
60
|
+
if (binding.entryExpiresAt <= now)
|
|
61
|
+
throw new Error("当前资源授权已过期，请返回工作台重新进入桂小智。");
|
|
62
|
+
if (binding.refresh === undefined) {
|
|
63
|
+
const pending = refreshWorkbenchBinding(client, daemon, binding).finally(() => {
|
|
64
|
+
if (binding.refresh === pending)
|
|
65
|
+
delete binding.refresh;
|
|
66
|
+
});
|
|
67
|
+
binding.refresh = pending;
|
|
68
|
+
}
|
|
69
|
+
await binding.refresh;
|
|
70
|
+
}
|
|
71
|
+
async function refreshWorkbenchBinding(client, daemon, binding) {
|
|
72
|
+
const state = await client.createAgentAccessState(binding.bootstrapToken, binding.projectId);
|
|
73
|
+
await storeWorkbenchState(client, daemon, binding.handle, state);
|
|
74
|
+
binding.state = state;
|
|
75
|
+
}
|
|
76
|
+
async function storeWorkbenchState(client, daemon, handle, state) {
|
|
77
|
+
const response = await daemon.request("PUT", `${WORKBENCH_ACCESS_STATE_ROUTE}/${encodeURIComponent(handle)}`, state);
|
|
78
|
+
if (response.statusCode === 204)
|
|
79
|
+
return;
|
|
80
|
+
await client.revoke(state).catch(() => undefined);
|
|
81
|
+
throw new Error("Session daemon rejected the workbench resource state");
|
|
82
|
+
}
|
|
52
83
|
function expiryTime(value) {
|
|
53
84
|
const parsed = value === undefined ? Number.NaN : Date.parse(value);
|
|
54
85
|
return Number.isFinite(parsed) ? parsed : Number.POSITIVE_INFINITY;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gatewayIntegration.js","sourceRoot":"","sources":["../../../src/server/workbench/gatewayIntegration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"gatewayIntegration.js","sourceRoot":"","sources":["../../../src/server/workbench/gatewayIntegration.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,13 @@ export class McpHttpError extends Error {
|
|
|
5
5
|
this.status = status;
|
|
6
6
|
}
|
|
7
7
|
}
|
|
8
|
+
export class McpTransportError extends Error {
|
|
9
|
+
constructor(code, message, options) {
|
|
10
|
+
super(message, options);
|
|
11
|
+
this.code = code;
|
|
12
|
+
this.name = "McpTransportError";
|
|
13
|
+
}
|
|
14
|
+
}
|
|
8
15
|
export class WorkbenchMcpClient {
|
|
9
16
|
constructor(options) {
|
|
10
17
|
this.options = options;
|
|
@@ -43,13 +50,21 @@ export class WorkbenchMcpClient {
|
|
|
43
50
|
"content-type": "application/json",
|
|
44
51
|
...(sessionId === undefined ? {} : { "mcp-session-id": sessionId }),
|
|
45
52
|
};
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
+
let response;
|
|
54
|
+
let text;
|
|
55
|
+
try {
|
|
56
|
+
response = await this.fetchImpl(this.options.mcpUrl, {
|
|
57
|
+
method: "POST",
|
|
58
|
+
headers,
|
|
59
|
+
body: JSON.stringify(body),
|
|
60
|
+
signal: AbortSignal.timeout(this.options.timeoutMs),
|
|
61
|
+
});
|
|
62
|
+
text = await response.text();
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
const code = transportErrorCode(error);
|
|
66
|
+
throw new McpTransportError(code, transportErrorMessage(code), { cause: error });
|
|
67
|
+
}
|
|
53
68
|
if (!response.ok)
|
|
54
69
|
throw new McpHttpError(response.status, mcpErrorMessage(text, response.status));
|
|
55
70
|
return { headers: response.headers, value: expectBody ? parseMcpPayload(text, response.headers.get("content-type")) : undefined };
|
|
@@ -145,4 +160,21 @@ function booleanField(value, key) {
|
|
|
145
160
|
throw new Error(`${key} must be a boolean`);
|
|
146
161
|
return field;
|
|
147
162
|
}
|
|
163
|
+
function transportErrorCode(error) {
|
|
164
|
+
let current = error;
|
|
165
|
+
for (let depth = 0; depth < 4 && current instanceof Error; depth += 1) {
|
|
166
|
+
if (current.name === "TimeoutError" || current.name === "AbortError")
|
|
167
|
+
return "timeout";
|
|
168
|
+
const code = "code" in current ? current.code : undefined;
|
|
169
|
+
if (typeof code === "string" && /^[A-Z0-9_]{1,64}$/u.test(code))
|
|
170
|
+
return code;
|
|
171
|
+
current = current.cause;
|
|
172
|
+
}
|
|
173
|
+
return "transport_error";
|
|
174
|
+
}
|
|
175
|
+
function transportErrorMessage(code) {
|
|
176
|
+
if (code === "timeout")
|
|
177
|
+
return "MCP 通道请求超时";
|
|
178
|
+
return code === "transport_error" ? "MCP 通道连接失败" : `MCP 通道连接失败（${code}）`;
|
|
179
|
+
}
|
|
148
180
|
//# sourceMappingURL=mcpClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpClient.js","sourceRoot":"","sources":["../../../src/server/workbench/mcpClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAErE,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,YAAqB,MAAc,EAAE,OAAe;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;QADI,WAAM,GAAN,MAAM,CAAQ;IAEnC,CAAC;CACF;AAQD,MAAM,OAAO,kBAAkB;IAG7B,YAA6B,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;QAC7D,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAAa,EAAE,cAAsB,EAAE,IAA6B,EAAE,cAAuB;QAChH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE;YACnD,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,CAAC;YACL,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;SAChI,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC5D,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC7H,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,2BAA2B,EAAE,EAAE,KAAK,CAAC,CAAC;QACjG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE;YAChD,OAAO,EAAE,KAAK;YACd,EAAE,EAAE,CAAC;YACL,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE;gBACN,IAAI,EAAE,uBAAuB;gBAC7B,SAAS,EAAE;oBACT,eAAe,EAAE,cAAc;oBAC/B,SAAS,EAAE,IAAI;oBACf,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;iBAC7E;aACF;SACF,CAAC,CAAC;QACH,OAAO,2BAA2B,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAEO,KAAK,CAAC,GAAG,CAAC,KAAa,EAAE,SAA6B,EAAE,IAAa,EAAE,UAAU,GAAG,IAAI;QAC9F,MAAM,OAAO,GAA2B;YACtC,aAAa,EAAE,UAAU,KAAK,EAAE;YAChC,MAAM,EAAE,qCAAqC;YAC7C,cAAc,EAAE,kBAAkB;YAClC,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC;SACpE,CAAC;QACF,
|
|
1
|
+
{"version":3,"file":"mcpClient.js","sourceRoot":"","sources":["../../../src/server/workbench/mcpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
|
|
|
2
2
|
import { defineTool } from "@earendil-works/pi-coding-agent";
|
|
3
3
|
import { Type } from "typebox";
|
|
4
4
|
import { requireAuthorizedL0Capability, searchAuthorizedCapabilities } from "./capabilitySearch.js";
|
|
5
|
-
import { McpHttpError } from "./mcpClient.js";
|
|
5
|
+
import { McpHttpError, McpTransportError } from "./mcpClient.js";
|
|
6
6
|
import { WorkbenchHttpError } from "./workbenchClient.js";
|
|
7
7
|
const SearchCapabilitiesParams = Type.Object({
|
|
8
8
|
keyword: Type.Optional(Type.String()),
|
|
@@ -81,6 +81,7 @@ export function createWorkbenchToolDefinitions(deps) {
|
|
|
81
81
|
traceId,
|
|
82
82
|
capabilityName: params.capability_name,
|
|
83
83
|
statusCode: errorStatus(error),
|
|
84
|
+
errorCode: errorCode(error),
|
|
84
85
|
durationMs: Date.now() - startedAt,
|
|
85
86
|
}, "Workbench capability call rejected or failed");
|
|
86
87
|
recordCapabilityAudit(deps, {
|
|
@@ -130,6 +131,8 @@ async function callWithOneTransientRetry(deps, capabilityName, capabilityVersion
|
|
|
130
131
|
deps.invalidate();
|
|
131
132
|
throw new Error("当前资源授权已过期或发生变化，请返回工作台重新进入桂小智。", { cause: error });
|
|
132
133
|
}
|
|
134
|
+
if (attempt === 0 && error instanceof McpTransportError)
|
|
135
|
+
continue;
|
|
133
136
|
if (attempt === 0 && error instanceof McpHttpError && [502, 503, 504].includes(error.status))
|
|
134
137
|
continue;
|
|
135
138
|
throw error;
|
|
@@ -140,6 +143,17 @@ async function callWithOneTransientRetry(deps, capabilityName, capabilityVersion
|
|
|
140
143
|
function errorStatus(error) {
|
|
141
144
|
if (error instanceof WorkbenchHttpError || error instanceof McpHttpError)
|
|
142
145
|
return error.status;
|
|
146
|
+
if (error instanceof McpTransportError)
|
|
147
|
+
return `mcp_transport_${error.code}`;
|
|
143
148
|
return "local_error";
|
|
144
149
|
}
|
|
150
|
+
function errorCode(error) {
|
|
151
|
+
if (error instanceof McpTransportError)
|
|
152
|
+
return error.code;
|
|
153
|
+
if (error instanceof WorkbenchHttpError)
|
|
154
|
+
return `workbench_http_${String(error.status)}`;
|
|
155
|
+
if (error instanceof McpHttpError)
|
|
156
|
+
return `mcp_http_${String(error.status)}`;
|
|
157
|
+
return error instanceof Error ? error.name : "unknown";
|
|
158
|
+
}
|
|
145
159
|
//# sourceMappingURL=workbenchTools.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workbenchTools.js","sourceRoot":"","sources":["../../../src/server/workbench/workbenchTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,6BAA6B,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACpG,OAAO,EAAE,YAAY,EAAsB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"workbenchTools.js","sourceRoot":"","sources":["../../../src/server/workbench/workbenchTools.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED