cursor-api-proxy 0.3.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +81 -34
- package/dist/cli/accounts.d.ts +18 -0
- package/dist/cli/accounts.js +149 -0
- package/dist/cli/accounts.js.map +1 -0
- package/dist/cli/args.d.ts +14 -0
- package/dist/cli/args.js +93 -0
- package/dist/cli/args.js.map +1 -0
- package/dist/cli/constants.d.ts +1 -0
- package/dist/cli/constants.js +4 -0
- package/dist/cli/constants.js.map +1 -0
- package/dist/cli/login.d.ts +1 -0
- package/dist/cli/login.js +143 -0
- package/dist/cli/login.js.map +1 -0
- package/dist/cli/reset-hwid.d.ts +24 -0
- package/dist/cli/reset-hwid.js +277 -0
- package/dist/cli/reset-hwid.js.map +1 -0
- package/dist/cli/usage.d.ts +31 -0
- package/dist/cli/usage.js +214 -0
- package/dist/cli/usage.js.map +1 -0
- package/dist/cli.d.ts +1 -4
- package/dist/cli.js +40 -35
- package/dist/cli.js.map +1 -1
- package/dist/lib/account-pool.d.ts +35 -0
- package/dist/lib/account-pool.js +143 -0
- package/dist/lib/account-pool.js.map +1 -0
- package/dist/lib/agent-runner.d.ts +2 -2
- package/dist/lib/agent-runner.js +18 -6
- package/dist/lib/agent-runner.js.map +1 -1
- package/dist/lib/anthropic.js +22 -11
- package/dist/lib/anthropic.js.map +1 -1
- package/dist/lib/config.d.ts +4 -0
- package/dist/lib/config.js +2 -0
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/env.d.ts +4 -0
- package/dist/lib/env.js +68 -8
- package/dist/lib/env.js.map +1 -1
- package/dist/lib/handlers/anthropic-messages.js +60 -11
- package/dist/lib/handlers/anthropic-messages.js.map +1 -1
- package/dist/lib/handlers/chat-completions.js +54 -7
- package/dist/lib/handlers/chat-completions.js.map +1 -1
- package/dist/lib/handlers/models.d.ts +1 -0
- package/dist/lib/handlers/models.js +16 -6
- package/dist/lib/handlers/models.js.map +1 -1
- package/dist/lib/max-mode-preflight.d.ts +1 -1
- package/dist/lib/max-mode-preflight.js +9 -3
- package/dist/lib/max-mode-preflight.js.map +1 -1
- package/dist/lib/openai.d.ts +10 -0
- package/dist/lib/openai.js +53 -1
- package/dist/lib/openai.js.map +1 -1
- package/dist/lib/process.d.ts +6 -0
- package/dist/lib/process.js +71 -9
- package/dist/lib/process.js.map +1 -1
- package/dist/lib/request-listener.js +28 -4
- package/dist/lib/request-listener.js.map +1 -1
- package/dist/lib/request-log.d.ts +3 -0
- package/dist/lib/request-log.js +37 -0
- package/dist/lib/request-log.js.map +1 -1
- package/dist/lib/sanitize.d.ts +21 -0
- package/dist/lib/sanitize.js +79 -0
- package/dist/lib/sanitize.js.map +1 -0
- package/dist/lib/server.d.ts +6 -1
- package/dist/lib/server.js +75 -0
- package/dist/lib/server.js.map +1 -1
- package/package.json +5 -2
package/dist/cli.js
CHANGED
|
@@ -1,52 +1,57 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import fs from "node:fs";
|
|
3
|
+
import path from "node:path";
|
|
3
4
|
import { fileURLToPath } from "node:url";
|
|
4
|
-
import pkg from "../package.json" with { type: "json" };
|
|
5
5
|
import { loadBridgeConfig } from "./lib/config.js";
|
|
6
|
-
import { startBridgeServer } from "./lib/server.js";
|
|
6
|
+
import { startBridgeServer, setupGracefulShutdown } from "./lib/server.js";
|
|
7
|
+
import { parseArgs, printHelp } from "./cli/args.js";
|
|
8
|
+
import { handleAccountsList, handleLogout } from "./cli/accounts.js";
|
|
9
|
+
import { handleLogin } from "./cli/login.js";
|
|
10
|
+
import { handleResetHwid } from "./cli/reset-hwid.js";
|
|
11
|
+
// Re-export parseArgs so src/cli.test.ts can import it without a separate path
|
|
12
|
+
export { parseArgs } from "./cli/args.js";
|
|
13
|
+
// ---------------------------------------------------------------------------
|
|
14
|
+
// Package metadata
|
|
15
|
+
// ---------------------------------------------------------------------------
|
|
7
16
|
const __filename = fileURLToPath(import.meta.url);
|
|
8
|
-
const
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
let help = false;
|
|
15
|
-
for (const arg of argv) {
|
|
16
|
-
if (arg === "--tailscale") {
|
|
17
|
-
tailscale = true;
|
|
18
|
-
continue;
|
|
19
|
-
}
|
|
20
|
-
if (arg === "--help" || arg === "-h") {
|
|
21
|
-
help = true;
|
|
22
|
-
continue;
|
|
23
|
-
}
|
|
24
|
-
throw new Error(`Unknown argument: ${arg}`);
|
|
25
|
-
}
|
|
26
|
-
return { tailscale, help };
|
|
27
|
-
}
|
|
28
|
-
function printHelp() {
|
|
29
|
-
console.log("cursor-api-proxy");
|
|
30
|
-
console.log("");
|
|
31
|
-
console.log("Usage:");
|
|
32
|
-
console.log(" cursor-api-proxy [--tailscale]");
|
|
33
|
-
console.log("");
|
|
34
|
-
console.log("Options:");
|
|
35
|
-
console.log(" --tailscale Bind to 0.0.0.0 for tailnet/LAN access");
|
|
36
|
-
console.log(" -h, --help Show this help message");
|
|
37
|
-
}
|
|
17
|
+
const __dirname = path.dirname(__filename);
|
|
18
|
+
const pkgPath = path.join(__dirname, "..", "package.json");
|
|
19
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
|
|
20
|
+
// ---------------------------------------------------------------------------
|
|
21
|
+
// Entry point
|
|
22
|
+
// ---------------------------------------------------------------------------
|
|
38
23
|
async function main() {
|
|
39
24
|
const args = parseArgs(process.argv.slice(2));
|
|
40
25
|
if (args.help) {
|
|
41
|
-
printHelp();
|
|
26
|
+
printHelp(pkg.version);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
if (args.login) {
|
|
30
|
+
await handleLogin(args.accountName, args.proxies);
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
if (args.logout) {
|
|
34
|
+
await handleLogout(args.accountName);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
if (args.accountsList) {
|
|
38
|
+
await handleAccountsList();
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
if (args.resetHwid) {
|
|
42
|
+
await handleResetHwid({ deepClean: args.deepClean, dryRun: args.dryRun });
|
|
42
43
|
return;
|
|
43
44
|
}
|
|
44
45
|
const config = loadBridgeConfig({ tailscale: args.tailscale });
|
|
45
|
-
startBridgeServer({ version: pkg.version, config });
|
|
46
|
+
const servers = startBridgeServer({ version: pkg.version, config });
|
|
47
|
+
setupGracefulShutdown(servers);
|
|
46
48
|
}
|
|
49
|
+
const realArgv1 = process.argv[1] ? fs.realpathSync(process.argv[1]) : "";
|
|
50
|
+
const isMainModule = realArgv1 === fs.realpathSync(__filename);
|
|
47
51
|
if (isMainModule) {
|
|
48
52
|
main().catch((err) => {
|
|
49
|
-
|
|
53
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
54
|
+
console.error(`Error: ${msg}`);
|
|
50
55
|
process.exit(1);
|
|
51
56
|
});
|
|
52
57
|
}
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export type AccountStat = {
|
|
2
|
+
configDir: string;
|
|
3
|
+
activeRequests: number;
|
|
4
|
+
totalRequests: number;
|
|
5
|
+
totalSuccess: number;
|
|
6
|
+
totalErrors: number;
|
|
7
|
+
totalRateLimits: number;
|
|
8
|
+
totalLatencyMs: number;
|
|
9
|
+
isRateLimited: boolean;
|
|
10
|
+
rateLimitUntil: number;
|
|
11
|
+
};
|
|
12
|
+
export declare class AccountPool {
|
|
13
|
+
private accounts;
|
|
14
|
+
constructor(configDirs: string[]);
|
|
15
|
+
/**
|
|
16
|
+
* Get the least busy account using a combination of active requests and round-robin.
|
|
17
|
+
* Ignores accounts that are currently rate limited.
|
|
18
|
+
*/
|
|
19
|
+
getNextConfigDir(): string | undefined;
|
|
20
|
+
reportRequestStart(configDir?: string): void;
|
|
21
|
+
reportRequestSuccess(configDir?: string, latencyMs?: number): void;
|
|
22
|
+
reportRequestError(configDir?: string, latencyMs?: number): void;
|
|
23
|
+
reportRequestEnd(configDir?: string): void;
|
|
24
|
+
reportRateLimit(configDir?: string, penaltyMs?: number): void;
|
|
25
|
+
getStats(): AccountStat[];
|
|
26
|
+
getConfigDirsCount(): number;
|
|
27
|
+
}
|
|
28
|
+
export declare function initAccountPool(configDirs: string[]): void;
|
|
29
|
+
export declare function getNextAccountConfigDir(): string | undefined;
|
|
30
|
+
export declare function reportRequestStart(configDir?: string): void;
|
|
31
|
+
export declare function reportRequestEnd(configDir?: string): void;
|
|
32
|
+
export declare function reportRateLimit(configDir?: string, penaltyMs?: number): void;
|
|
33
|
+
export declare function reportRequestSuccess(configDir?: string, latencyMs?: number): void;
|
|
34
|
+
export declare function reportRequestError(configDir?: string, latencyMs?: number): void;
|
|
35
|
+
export declare function getAccountStats(): AccountStat[];
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
export class AccountPool {
|
|
2
|
+
accounts;
|
|
3
|
+
constructor(configDirs) {
|
|
4
|
+
this.accounts = configDirs.map((dir) => ({
|
|
5
|
+
configDir: dir,
|
|
6
|
+
activeRequests: 0,
|
|
7
|
+
lastUsed: 0,
|
|
8
|
+
rateLimitUntil: 0,
|
|
9
|
+
totalRequests: 0,
|
|
10
|
+
totalSuccess: 0,
|
|
11
|
+
totalErrors: 0,
|
|
12
|
+
totalRateLimits: 0,
|
|
13
|
+
totalLatencyMs: 0,
|
|
14
|
+
}));
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Get the least busy account using a combination of active requests and round-robin.
|
|
18
|
+
* Ignores accounts that are currently rate limited.
|
|
19
|
+
*/
|
|
20
|
+
getNextConfigDir() {
|
|
21
|
+
if (this.accounts.length === 0) {
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
const now = Date.now();
|
|
25
|
+
// Filter out rate-limited accounts (unless they are all rate-limited, then just use the one that recovers soonest)
|
|
26
|
+
const availableAccounts = this.accounts.filter((a) => a.rateLimitUntil < now);
|
|
27
|
+
let targetAccounts = availableAccounts;
|
|
28
|
+
if (availableAccounts.length === 0) {
|
|
29
|
+
// If all are rate limited, sort by who recovers first
|
|
30
|
+
targetAccounts = [...this.accounts].sort((a, b) => a.rateLimitUntil - b.rateLimitUntil);
|
|
31
|
+
}
|
|
32
|
+
// Sort by active requests (ascending), then by last used (ascending for round-robin effect)
|
|
33
|
+
const sorted = [...targetAccounts].sort((a, b) => {
|
|
34
|
+
if (a.activeRequests !== b.activeRequests) {
|
|
35
|
+
return a.activeRequests - b.activeRequests;
|
|
36
|
+
}
|
|
37
|
+
return a.lastUsed - b.lastUsed;
|
|
38
|
+
});
|
|
39
|
+
const selected = sorted[0];
|
|
40
|
+
selected.lastUsed = now;
|
|
41
|
+
return selected.configDir;
|
|
42
|
+
}
|
|
43
|
+
reportRequestStart(configDir) {
|
|
44
|
+
if (!configDir)
|
|
45
|
+
return;
|
|
46
|
+
const account = this.accounts.find((a) => a.configDir === configDir);
|
|
47
|
+
if (account) {
|
|
48
|
+
account.activeRequests++;
|
|
49
|
+
account.totalRequests++;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
reportRequestSuccess(configDir, latencyMs = 0) {
|
|
53
|
+
if (!configDir)
|
|
54
|
+
return;
|
|
55
|
+
const account = this.accounts.find((a) => a.configDir === configDir);
|
|
56
|
+
if (account) {
|
|
57
|
+
account.totalSuccess++;
|
|
58
|
+
account.totalLatencyMs += latencyMs;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
reportRequestError(configDir, latencyMs = 0) {
|
|
62
|
+
if (!configDir)
|
|
63
|
+
return;
|
|
64
|
+
const account = this.accounts.find((a) => a.configDir === configDir);
|
|
65
|
+
if (account) {
|
|
66
|
+
account.totalErrors++;
|
|
67
|
+
account.totalLatencyMs += latencyMs;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
reportRequestEnd(configDir) {
|
|
71
|
+
if (!configDir)
|
|
72
|
+
return;
|
|
73
|
+
const account = this.accounts.find((a) => a.configDir === configDir);
|
|
74
|
+
if (account && account.activeRequests > 0) {
|
|
75
|
+
account.activeRequests--;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
reportRateLimit(configDir, penaltyMs = 60000) {
|
|
79
|
+
if (!configDir)
|
|
80
|
+
return;
|
|
81
|
+
const account = this.accounts.find((a) => a.configDir === configDir);
|
|
82
|
+
if (account) {
|
|
83
|
+
account.rateLimitUntil = Date.now() + penaltyMs;
|
|
84
|
+
account.totalRateLimits++;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
getStats() {
|
|
88
|
+
const now = Date.now();
|
|
89
|
+
return this.accounts.map((a) => ({
|
|
90
|
+
configDir: a.configDir,
|
|
91
|
+
activeRequests: a.activeRequests,
|
|
92
|
+
totalRequests: a.totalRequests,
|
|
93
|
+
totalSuccess: a.totalSuccess,
|
|
94
|
+
totalErrors: a.totalErrors,
|
|
95
|
+
totalRateLimits: a.totalRateLimits,
|
|
96
|
+
totalLatencyMs: a.totalLatencyMs,
|
|
97
|
+
isRateLimited: a.rateLimitUntil > now,
|
|
98
|
+
rateLimitUntil: a.rateLimitUntil,
|
|
99
|
+
}));
|
|
100
|
+
}
|
|
101
|
+
getConfigDirsCount() {
|
|
102
|
+
return this.accounts.length;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
// Global instance to be initialized at server start
|
|
106
|
+
let globalPool = null;
|
|
107
|
+
export function initAccountPool(configDirs) {
|
|
108
|
+
globalPool = new AccountPool(configDirs);
|
|
109
|
+
}
|
|
110
|
+
export function getNextAccountConfigDir() {
|
|
111
|
+
if (!globalPool)
|
|
112
|
+
return undefined;
|
|
113
|
+
return globalPool.getNextConfigDir();
|
|
114
|
+
}
|
|
115
|
+
export function reportRequestStart(configDir) {
|
|
116
|
+
if (globalPool) {
|
|
117
|
+
globalPool.reportRequestStart(configDir);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
export function reportRequestEnd(configDir) {
|
|
121
|
+
if (globalPool) {
|
|
122
|
+
globalPool.reportRequestEnd(configDir);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
export function reportRateLimit(configDir, penaltyMs) {
|
|
126
|
+
if (globalPool) {
|
|
127
|
+
globalPool.reportRateLimit(configDir, penaltyMs);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
export function reportRequestSuccess(configDir, latencyMs) {
|
|
131
|
+
if (globalPool) {
|
|
132
|
+
globalPool.reportRequestSuccess(configDir, latencyMs);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
export function reportRequestError(configDir, latencyMs) {
|
|
136
|
+
if (globalPool) {
|
|
137
|
+
globalPool.reportRequestError(configDir, latencyMs);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
export function getAccountStats() {
|
|
141
|
+
return globalPool?.getStats() ?? [];
|
|
142
|
+
}
|
|
143
|
+
//# sourceMappingURL=account-pool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"account-pool.js","sourceRoot":"","sources":["../../src/lib/account-pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,9 @@ export type AgentRunResult = {
|
|
|
4
4
|
stdout: string;
|
|
5
5
|
stderr: string;
|
|
6
6
|
};
|
|
7
|
-
export declare function runAgentSync(config: BridgeConfig, workspaceDir: string, cmdArgs: string[], tempDir?: string): Promise<AgentRunResult>;
|
|
7
|
+
export declare function runAgentSync(config: BridgeConfig, workspaceDir: string, cmdArgs: string[], tempDir?: string, configDir?: string, signal?: AbortSignal): Promise<AgentRunResult>;
|
|
8
8
|
export type StreamLineHandler = (line: string) => void;
|
|
9
|
-
export declare function runAgentStream(config: BridgeConfig, workspaceDir: string, cmdArgs: string[], onLine: StreamLineHandler, tempDir?: string): Promise<{
|
|
9
|
+
export declare function runAgentStream(config: BridgeConfig, workspaceDir: string, cmdArgs: string[], onLine: StreamLineHandler, tempDir?: string, configDir?: string, signal?: AbortSignal): Promise<{
|
|
10
10
|
code: number;
|
|
11
11
|
stderr: string;
|
|
12
12
|
}>;
|
package/dist/lib/agent-runner.js
CHANGED
|
@@ -1,11 +1,22 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
2
|
import { run, runStreaming } from "./process.js";
|
|
3
|
-
|
|
3
|
+
import { readKeychainToken, writeCachedToken } from "../cli/usage.js";
|
|
4
|
+
function cacheTokenForAccount(configDir) {
|
|
5
|
+
if (!configDir)
|
|
6
|
+
return;
|
|
7
|
+
const token = readKeychainToken();
|
|
8
|
+
if (token)
|
|
9
|
+
writeCachedToken(configDir, token);
|
|
10
|
+
}
|
|
11
|
+
export function runAgentSync(config, workspaceDir, cmdArgs, tempDir, configDir, signal) {
|
|
4
12
|
return run(config.agentBin, cmdArgs, {
|
|
5
13
|
cwd: workspaceDir,
|
|
6
14
|
timeoutMs: config.timeoutMs,
|
|
7
15
|
maxMode: config.maxMode,
|
|
8
|
-
|
|
16
|
+
configDir,
|
|
17
|
+
signal,
|
|
18
|
+
}).finally(() => {
|
|
19
|
+
cacheTokenForAccount(configDir);
|
|
9
20
|
if (tempDir) {
|
|
10
21
|
try {
|
|
11
22
|
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
@@ -14,16 +25,18 @@ export function runAgentSync(config, workspaceDir, cmdArgs, tempDir) {
|
|
|
14
25
|
/* ignore */
|
|
15
26
|
}
|
|
16
27
|
}
|
|
17
|
-
return out;
|
|
18
28
|
});
|
|
19
29
|
}
|
|
20
|
-
export function runAgentStream(config, workspaceDir, cmdArgs, onLine, tempDir) {
|
|
30
|
+
export function runAgentStream(config, workspaceDir, cmdArgs, onLine, tempDir, configDir, signal) {
|
|
21
31
|
return runStreaming(config.agentBin, cmdArgs, {
|
|
22
32
|
cwd: workspaceDir,
|
|
23
33
|
timeoutMs: config.timeoutMs,
|
|
24
34
|
maxMode: config.maxMode,
|
|
25
35
|
onLine,
|
|
26
|
-
|
|
36
|
+
configDir,
|
|
37
|
+
signal,
|
|
38
|
+
}).finally(() => {
|
|
39
|
+
cacheTokenForAccount(configDir);
|
|
27
40
|
if (tempDir) {
|
|
28
41
|
try {
|
|
29
42
|
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
@@ -32,7 +45,6 @@ export function runAgentStream(config, workspaceDir, cmdArgs, onLine, tempDir) {
|
|
|
32
45
|
/* ignore */
|
|
33
46
|
}
|
|
34
47
|
}
|
|
35
|
-
return result;
|
|
36
48
|
});
|
|
37
49
|
}
|
|
38
50
|
//# sourceMappingURL=agent-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runner.js","sourceRoot":"","sources":["../../src/lib/agent-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-runner.js","sourceRoot":"","sources":["../../src/lib/agent-runner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEtE,SAAS,oBAAoB,CAAC,SAAkB;IAC9C,IAAI,CAAC,SAAS;QAAE,OAAO;IACvB,MAAM,KAAK,GAAG,iBAAiB,EAAE,CAAC;IAClC,IAAI,KAAK;QAAE,gBAAgB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAChD,CAAC;AAQD,MAAM,UAAU,YAAY,CAC1B,MAAoB,EACpB,YAAoB,EACpB,OAAiB,EACjB,OAAgB,EAChB,SAAkB,EAClB,MAAoB;IAEpB,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE;QACnC,GAAG,EAAE,YAAY;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,SAAS;QACT,MAAM;KACP,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QACd,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY;YACd,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAID,MAAM,UAAU,cAAc,CAC5B,MAAoB,EACpB,YAAoB,EACpB,OAAiB,EACjB,MAAyB,EACzB,OAAgB,EAChB,SAAkB,EAClB,MAAoB;IAEpB,OAAO,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE;QAC5C,GAAG,EAAE,YAAY;QACjB,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM;QACN,SAAS;QACT,MAAM;KACP,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;QACd,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY;YACd,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/lib/anthropic.js
CHANGED
|
@@ -20,22 +20,33 @@ function systemToText(system) {
|
|
|
20
20
|
})
|
|
21
21
|
.join("\n");
|
|
22
22
|
}
|
|
23
|
+
function anthropicBlockToText(p) {
|
|
24
|
+
if (!p)
|
|
25
|
+
return "";
|
|
26
|
+
if (typeof p === "string")
|
|
27
|
+
return p;
|
|
28
|
+
if (p.type === "text" && typeof p.text === "string")
|
|
29
|
+
return p.text;
|
|
30
|
+
if (p.type === "image") {
|
|
31
|
+
const src = p.source;
|
|
32
|
+
if (src?.type === "base64")
|
|
33
|
+
return `[Image: base64 ${src.media_type ?? "image"}]`;
|
|
34
|
+
if (src?.type === "url")
|
|
35
|
+
return `[Image: ${src.url}]`;
|
|
36
|
+
return "[Image]";
|
|
37
|
+
}
|
|
38
|
+
if (p.type === "document") {
|
|
39
|
+
const title = p.title ?? p.source?.url ?? "";
|
|
40
|
+
return title ? `[Document: ${title}]` : "[Document]";
|
|
41
|
+
}
|
|
42
|
+
return "";
|
|
43
|
+
}
|
|
23
44
|
function anthropicContentToText(content) {
|
|
24
45
|
if (typeof content === "string")
|
|
25
46
|
return content;
|
|
26
47
|
if (!Array.isArray(content))
|
|
27
48
|
return "";
|
|
28
|
-
return content
|
|
29
|
-
.map((p) => {
|
|
30
|
-
if (!p)
|
|
31
|
-
return "";
|
|
32
|
-
if (typeof p === "string")
|
|
33
|
-
return p;
|
|
34
|
-
if (p.type === "text" && typeof p.text === "string")
|
|
35
|
-
return p.text;
|
|
36
|
-
return "";
|
|
37
|
-
})
|
|
38
|
-
.join("");
|
|
49
|
+
return content.map(anthropicBlockToText).filter(Boolean).join(" ");
|
|
39
50
|
}
|
|
40
51
|
/**
|
|
41
52
|
* Convert Anthropic messages + optional system prompt to the prompt format
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/lib/anthropic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAetD,SAAS,YAAY,CAAC,MAA0C;IAC9D,IAAI,MAAM,IAAI,IAAI;QAAE,OAAO,EAAE,CAAC;IAC9B,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAC3C,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC,IAAI,CAAC;QACnE,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/lib/anthropic.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/config.d.ts
CHANGED
|
@@ -24,5 +24,9 @@ export type BridgeConfig = {
|
|
|
24
24
|
verbose: boolean;
|
|
25
25
|
/** When true, enable Cursor Max Mode (larger context, more tool calls) via cli-config.json preflight. */
|
|
26
26
|
maxMode: boolean;
|
|
27
|
+
/** Pool of cursor configuration directories for round-robin account rotation. */
|
|
28
|
+
configDirs: string[];
|
|
29
|
+
/** When true, runs each config dir on its own incrementing port starting from `port` */
|
|
30
|
+
multiPort: boolean;
|
|
27
31
|
};
|
|
28
32
|
export declare function loadBridgeConfig(opts?: EnvOptions): BridgeConfig;
|
package/dist/lib/config.js
CHANGED
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmB,MAAM,UAAU,CAAC;AAkC1D,MAAM,UAAU,gBAAgB,CAAC,OAAmB,EAAE;IACpD,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEhC,OAAO;QACL,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,YAAY,EAAE,GAAG,CAAC,YAAY;QAC9B,IAAI,EAAE,KAAK,EAAE,oDAAoD;QACjE,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,UAAU,EAAE,GAAG,CAAC,UAAU;QAC1B,eAAe,EAAE,GAAG,CAAC,eAAe;QACpC,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,UAAU,EAAE,GAAG,CAAC,UAAU,IAAI,EAAE;QAChC,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAC;AACJ,CAAC"}
|
package/dist/lib/env.d.ts
CHANGED
|
@@ -26,6 +26,10 @@ export type LoadedEnv = {
|
|
|
26
26
|
verbose: boolean;
|
|
27
27
|
/** When true, set maxMode in cli-config.json before each run (larger context, more tools). */
|
|
28
28
|
maxMode: boolean;
|
|
29
|
+
/** Pool of cursor configuration directories for round-robin account rotation. */
|
|
30
|
+
configDirs: string[];
|
|
31
|
+
/** When true, runs each config dir on its own incrementing port starting from `port` */
|
|
32
|
+
multiPort: boolean;
|
|
29
33
|
};
|
|
30
34
|
export type AgentCommand = {
|
|
31
35
|
command: string;
|
package/dist/lib/env.js
CHANGED
|
@@ -50,23 +50,74 @@ function resolveAbsolutePath(raw, cwd) {
|
|
|
50
50
|
return undefined;
|
|
51
51
|
return path.resolve(cwd, raw);
|
|
52
52
|
}
|
|
53
|
+
/**
|
|
54
|
+
* Auto-discovers configuration directories located inside ~/.cursor-api-proxy/accounts/
|
|
55
|
+
*/
|
|
56
|
+
function isAuthenticatedAccountDir(dir) {
|
|
57
|
+
const configFile = path.join(dir, "cli-config.json");
|
|
58
|
+
if (!fs.existsSync(configFile))
|
|
59
|
+
return false;
|
|
60
|
+
try {
|
|
61
|
+
const config = JSON.parse(fs.readFileSync(configFile, "utf-8"));
|
|
62
|
+
return Boolean(config?.authInfo?.email);
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
function discoverAccountDirs(homeDir) {
|
|
69
|
+
if (!homeDir)
|
|
70
|
+
return [];
|
|
71
|
+
const accountsDir = path.join(homeDir, ".cursor-api-proxy", "accounts");
|
|
72
|
+
if (!fs.existsSync(accountsDir))
|
|
73
|
+
return [];
|
|
74
|
+
try {
|
|
75
|
+
const entries = fs.readdirSync(accountsDir, { withFileTypes: true });
|
|
76
|
+
return entries
|
|
77
|
+
.filter((e) => e.isDirectory())
|
|
78
|
+
.map((e) => path.join(accountsDir, e.name))
|
|
79
|
+
.filter(isAuthenticatedAccountDir);
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
return [];
|
|
83
|
+
}
|
|
84
|
+
}
|
|
53
85
|
export function loadEnvConfig(opts = {}) {
|
|
54
86
|
const env = getEnvSource(opts.env);
|
|
55
87
|
const cwd = getCwd(opts.cwd);
|
|
56
|
-
const host = envString(env, ["CURSOR_BRIDGE_HOST"]) ??
|
|
88
|
+
const host = envString(env, ["CURSOR_BRIDGE_HOST"]) ??
|
|
89
|
+
(opts.tailscale ? "0.0.0.0" : "127.0.0.1");
|
|
57
90
|
const portValue = envNumber(env, ["CURSOR_BRIDGE_PORT"], 8765);
|
|
58
91
|
const port = Number.isFinite(portValue) && portValue > 0 ? portValue : 8765;
|
|
92
|
+
const home = envString(env, ["HOME", "USERPROFILE"]);
|
|
59
93
|
const sessionsLogPath = (() => {
|
|
60
94
|
const explicit = resolveAbsolutePath(envString(env, ["CURSOR_BRIDGE_SESSIONS_LOG"]), cwd);
|
|
61
95
|
if (explicit)
|
|
62
96
|
return explicit;
|
|
63
|
-
const home = envString(env, ["HOME", "USERPROFILE"]);
|
|
64
97
|
if (home)
|
|
65
98
|
return path.join(home, ".cursor-api-proxy", "sessions.log");
|
|
66
99
|
return path.join(cwd, "sessions.log");
|
|
67
100
|
})();
|
|
101
|
+
const force = envBool(env, ["CURSOR_BRIDGE_FORCE"], false);
|
|
102
|
+
const rawConfigDirs = envString(env, [
|
|
103
|
+
"CURSOR_CONFIG_DIRS",
|
|
104
|
+
"CURSOR_ACCOUNT_DIRS",
|
|
105
|
+
]);
|
|
106
|
+
let configDirs = rawConfigDirs
|
|
107
|
+
? rawConfigDirs
|
|
108
|
+
.split(",")
|
|
109
|
+
.map((d) => resolveAbsolutePath(d.trim(), cwd))
|
|
110
|
+
.filter((d) => d !== undefined)
|
|
111
|
+
: [];
|
|
112
|
+
if (configDirs.length === 0) {
|
|
113
|
+
configDirs = discoverAccountDirs(home);
|
|
114
|
+
}
|
|
68
115
|
return {
|
|
69
|
-
agentBin: envString(env, [
|
|
116
|
+
agentBin: envString(env, [
|
|
117
|
+
"CURSOR_AGENT_BIN",
|
|
118
|
+
"CURSOR_CLI_BIN",
|
|
119
|
+
"CURSOR_CLI_PATH",
|
|
120
|
+
]) ?? "agent",
|
|
70
121
|
agentNode: envString(env, ["CURSOR_AGENT_NODE"]),
|
|
71
122
|
agentScript: envString(env, ["CURSOR_AGENT_SCRIPT"]),
|
|
72
123
|
commandShell: envString(env, ["COMSPEC"]) ?? "cmd.exe",
|
|
@@ -74,10 +125,11 @@ export function loadEnvConfig(opts = {}) {
|
|
|
74
125
|
port,
|
|
75
126
|
requiredKey: envString(env, ["CURSOR_BRIDGE_API_KEY"]),
|
|
76
127
|
defaultModel: normalizeModelId(envString(env, ["CURSOR_BRIDGE_DEFAULT_MODEL"])),
|
|
77
|
-
force
|
|
128
|
+
force,
|
|
78
129
|
approveMcps: envBool(env, ["CURSOR_BRIDGE_APPROVE_MCPS"], false),
|
|
79
130
|
strictModel: envBool(env, ["CURSOR_BRIDGE_STRICT_MODEL"], true),
|
|
80
|
-
workspace: resolveAbsolutePath(envString(env, ["CURSOR_BRIDGE_WORKSPACE"]), cwd) ??
|
|
131
|
+
workspace: resolveAbsolutePath(envString(env, ["CURSOR_BRIDGE_WORKSPACE"]), cwd) ??
|
|
132
|
+
cwd,
|
|
81
133
|
timeoutMs: envNumber(env, ["CURSOR_BRIDGE_TIMEOUT_MS"], 300_000),
|
|
82
134
|
tlsCertPath: resolveAbsolutePath(envString(env, ["CURSOR_BRIDGE_TLS_CERT"]), cwd),
|
|
83
135
|
tlsKeyPath: resolveAbsolutePath(envString(env, ["CURSOR_BRIDGE_TLS_KEY"]), cwd),
|
|
@@ -85,6 +137,8 @@ export function loadEnvConfig(opts = {}) {
|
|
|
85
137
|
chatOnlyWorkspace: envBool(env, ["CURSOR_BRIDGE_CHAT_ONLY_WORKSPACE"], true),
|
|
86
138
|
verbose: envBool(env, ["CURSOR_BRIDGE_VERBOSE"], false),
|
|
87
139
|
maxMode: envBool(env, ["CURSOR_BRIDGE_MAX_MODE"], false),
|
|
140
|
+
configDirs,
|
|
141
|
+
multiPort: envBool(env, ["CURSOR_BRIDGE_MULTI_PORT"], false),
|
|
88
142
|
};
|
|
89
143
|
}
|
|
90
144
|
export function resolveAgentCommand(cmd, args, opts = {}) {
|
|
@@ -104,7 +158,9 @@ export function resolveAgentCommand(cmd, args, opts = {}) {
|
|
|
104
158
|
args: [loaded.agentScript, ...args],
|
|
105
159
|
env: { ...env, CURSOR_INVOKED_AS: "agent.cmd" },
|
|
106
160
|
agentScriptPath,
|
|
107
|
-
configDir: fs.existsSync(path.join(configDir, "cli-config.json"))
|
|
161
|
+
configDir: fs.existsSync(path.join(configDir, "cli-config.json"))
|
|
162
|
+
? configDir
|
|
163
|
+
: undefined,
|
|
108
164
|
};
|
|
109
165
|
return out;
|
|
110
166
|
}
|
|
@@ -120,10 +176,14 @@ export function resolveAgentCommand(cmd, args, opts = {}) {
|
|
|
120
176
|
args: [script, ...args],
|
|
121
177
|
env: { ...env, CURSOR_INVOKED_AS: "agent.cmd" },
|
|
122
178
|
agentScriptPath: script,
|
|
123
|
-
configDir: fs.existsSync(path.join(configDir, "cli-config.json"))
|
|
179
|
+
configDir: fs.existsSync(path.join(configDir, "cli-config.json"))
|
|
180
|
+
? configDir
|
|
181
|
+
: undefined,
|
|
124
182
|
};
|
|
125
183
|
}
|
|
126
|
-
const quotedArgs = args
|
|
184
|
+
const quotedArgs = args
|
|
185
|
+
.map((arg) => (arg.includes(" ") ? `"${arg}"` : arg))
|
|
186
|
+
.join(" ");
|
|
127
187
|
const cmdLine = `""${cmd}" ${quotedArgs}"`;
|
|
128
188
|
return {
|
|
129
189
|
command: loaded.commandShell,
|
package/dist/lib/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"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"}
|