@hileeon/mcc 0.1.6 → 0.1.8
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/proxy/proxy-daemon.d.ts.map +1 -1
- package/dist/proxy/proxy-daemon.js +10 -1
- package/dist/proxy/proxy-daemon.js.map +1 -1
- package/dist/proxy/proxy-paths.d.ts +1 -0
- package/dist/proxy/proxy-paths.d.ts.map +1 -1
- package/dist/proxy/proxy-paths.js.map +1 -1
- package/lib/proxy/transformers/request-transformer.js +21 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-daemon.d.ts","sourceRoot":"","sources":["../../src/proxy/proxy-daemon.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuEH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,EACd,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"proxy-daemon.d.ts","sourceRoot":"","sources":["../../src/proxy/proxy-daemon.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuEH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,EACd,wBAAwB,CAAC,EAAE,MAAM,GAChC,OAAO,CAAC,gBAAgB,CAAC,CAgF3B;AAED;;GAEG;AACH,wBAAsB,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAOlE;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAKtG"}
|
|
@@ -107,7 +107,15 @@ async function startProxy(profileName, baseUrl, apiKey, model, proxyChatCompleti
|
|
|
107
107
|
// Check if already running
|
|
108
108
|
const existingSession = (0, proxy_paths_1.readProxySession)(profileName);
|
|
109
109
|
if (existingSession && await isProxyRunning(existingSession.port)) {
|
|
110
|
-
|
|
110
|
+
// If the caller provided a different proxyChatCompletionsPath, the existing
|
|
111
|
+
// proxy is incompatible — stop it and restart with the new path.
|
|
112
|
+
const existingPath = existingSession.proxyChatCompletionsPath;
|
|
113
|
+
if (proxyChatCompletionsPath && proxyChatCompletionsPath !== existingPath) {
|
|
114
|
+
await stopProxy(profileName);
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
return { port: existingSession.port, authToken: existingSession.authToken };
|
|
118
|
+
}
|
|
111
119
|
}
|
|
112
120
|
// Clean up stale state
|
|
113
121
|
stopProxy(profileName).catch(() => { });
|
|
@@ -157,6 +165,7 @@ async function startProxy(profileName, baseUrl, apiKey, model, proxyChatCompleti
|
|
|
157
165
|
host: '127.0.0.1',
|
|
158
166
|
authToken,
|
|
159
167
|
baseUrl,
|
|
168
|
+
proxyChatCompletionsPath,
|
|
160
169
|
startedAt: new Date().toISOString(),
|
|
161
170
|
};
|
|
162
171
|
(0, proxy_paths_1.writeProxySession)(session);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-daemon.js","sourceRoot":"","sources":["../../src/proxy/proxy-daemon.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgFH,
|
|
1
|
+
{"version":3,"file":"proxy-daemon.js","sourceRoot":"","sources":["../../src/proxy/proxy-daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export interface ProxySession {
|
|
|
15
15
|
authToken: string;
|
|
16
16
|
baseUrl: string;
|
|
17
17
|
startedAt: string;
|
|
18
|
+
proxyChatCompletionsPath?: string;
|
|
18
19
|
}
|
|
19
20
|
export declare function readProxyPid(profileName: string): number | null;
|
|
20
21
|
export declare function writeProxyPid(profileName: string, pid: number): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-paths.d.ts","sourceRoot":"","sources":["../../src/proxy/proxy-paths.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,kBAAkB,4BAA4B,CAAC;AAE5D,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"proxy-paths.d.ts","sourceRoot":"","sources":["../../src/proxy/proxy-paths.ts"],"names":[],"mappings":"AAAA;;;GAGG;AASH,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,eAAO,MAAM,cAAc,QAAQ,CAAC;AACpC,eAAO,MAAM,kBAAkB,4BAA4B,CAAC;AAE5D,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAMD,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQ/D;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAGpE;AAED,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAMxD;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAMzE;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,YAAY,GAAG,IAAI,CAG7D;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAM5D;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAM3D;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAG/D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-paths.js","sourceRoot":"","sources":["../../src/proxy/proxy-paths.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaH,kCAEC;AAED,0CAEC;AAED,kDAEC;
|
|
1
|
+
{"version":3,"file":"proxy-paths.js","sourceRoot":"","sources":["../../src/proxy/proxy-paths.ts"],"names":[],"mappings":"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"}
|
|
@@ -240,13 +240,33 @@ function transformMessages(messagesValue) {
|
|
|
240
240
|
messagesValue.forEach((message, messageIndex) => {
|
|
241
241
|
const parsedMessage = assertObject(message, `messages[${messageIndex}]`);
|
|
242
242
|
const role = parsedMessage.role;
|
|
243
|
+
const content = parsedMessage.content;
|
|
244
|
+
if (role === 'system') {
|
|
245
|
+
// System messages: pass through as-is for OpenAI compatibility.
|
|
246
|
+
if (typeof content === 'string') {
|
|
247
|
+
translatedMessages.push({ role: 'system', content });
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
if (Array.isArray(content)) {
|
|
251
|
+
const textParts = [];
|
|
252
|
+
for (const block of content) {
|
|
253
|
+
if (block.type === 'text') {
|
|
254
|
+
textParts.push(typeof block.text === 'string' ? block.text : '');
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
if (textParts.length > 0) {
|
|
258
|
+
translatedMessages.push({ role: 'system', content: textParts.join('') });
|
|
259
|
+
}
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
262
|
+
return;
|
|
263
|
+
}
|
|
243
264
|
if (role !== 'user' && role !== 'assistant') {
|
|
244
265
|
throw new Error(`messages[${messageIndex}].role must be "user" or "assistant"`);
|
|
245
266
|
}
|
|
246
267
|
if (pendingToolUseIds && pendingToolUseIds.size > 0 && role !== 'user') {
|
|
247
268
|
throw new Error(`messages[${messageIndex}].role must be "user" with tool_result blocks after assistant tool_use`);
|
|
248
269
|
}
|
|
249
|
-
const content = parsedMessage.content;
|
|
250
270
|
if (typeof content === 'string') {
|
|
251
271
|
if (pendingToolUseIds && pendingToolUseIds.size > 0) {
|
|
252
272
|
throw new Error(`messages[${messageIndex}].content must start with tool_result blocks for pending tool_use ids`);
|