paean 0.8.13 → 0.8.15
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/agent/service.d.ts +5 -0
- package/dist/agent/service.d.ts.map +1 -1
- package/dist/agent/service.js +8 -4
- package/dist/agent/service.js.map +1 -1
- package/dist/agent/types.d.ts +12 -2
- package/dist/agent/types.d.ts.map +1 -1
- package/dist/agent/utils.d.ts.map +1 -1
- package/dist/agent/utils.js +47 -32
- package/dist/agent/utils.js.map +1 -1
- package/dist/api/auth.d.ts +7 -0
- package/dist/api/auth.d.ts.map +1 -1
- package/dist/api/auth.js +70 -0
- package/dist/api/auth.js.map +1 -1
- package/dist/api/client.d.ts.map +1 -1
- package/dist/api/client.js +101 -7
- package/dist/api/client.js.map +1 -1
- package/dist/api/devices.d.ts +35 -0
- package/dist/api/devices.d.ts.map +1 -0
- package/dist/api/devices.js +77 -0
- package/dist/api/devices.js.map +1 -0
- package/dist/api/todo.d.ts +21 -0
- package/dist/api/todo.d.ts.map +1 -1
- package/dist/api/todo.js +18 -0
- package/dist/api/todo.js.map +1 -1
- package/dist/cli.js +17 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/completion.d.ts +7 -0
- package/dist/commands/completion.d.ts.map +1 -0
- package/dist/commands/completion.js +217 -0
- package/dist/commands/completion.js.map +1 -0
- package/dist/commands/config.d.ts +7 -0
- package/dist/commands/config.d.ts.map +1 -0
- package/dist/commands/config.js +107 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/devices.d.ts +7 -0
- package/dist/commands/devices.d.ts.map +1 -0
- package/dist/commands/devices.js +86 -0
- package/dist/commands/devices.js.map +1 -0
- package/dist/commands/history.d.ts +20 -0
- package/dist/commands/history.d.ts.map +1 -1
- package/dist/commands/history.js +160 -10
- package/dist/commands/history.js.map +1 -1
- package/dist/commands/login.d.ts.map +1 -1
- package/dist/commands/login.js +110 -1
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/logout.d.ts.map +1 -1
- package/dist/commands/logout.js +11 -0
- package/dist/commands/logout.js.map +1 -1
- package/dist/commands/mcp.d.ts +7 -0
- package/dist/commands/mcp.d.ts.map +1 -0
- package/dist/commands/mcp.js +179 -0
- package/dist/commands/mcp.js.map +1 -0
- package/dist/commands/sparklet.d.ts +7 -0
- package/dist/commands/sparklet.d.ts.map +1 -0
- package/dist/commands/sparklet.js +145 -0
- package/dist/commands/sparklet.js.map +1 -0
- package/dist/commands/tasks.d.ts.map +1 -1
- package/dist/commands/tasks.js +48 -1
- package/dist/commands/tasks.js.map +1 -1
- package/dist/commands/worker.d.ts.map +1 -1
- package/dist/commands/worker.js +83 -27
- package/dist/commands/worker.js.map +1 -1
- package/dist/mcp/cli-agent-tools.d.ts.map +1 -1
- package/dist/mcp/cli-agent-tools.js +4 -2
- package/dist/mcp/cli-agent-tools.js.map +1 -1
- package/dist/mcp/client.d.ts +5 -0
- package/dist/mcp/client.d.ts.map +1 -1
- package/dist/mcp/client.js +23 -2
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/system.d.ts.map +1 -1
- package/dist/mcp/system.js +291 -3
- package/dist/mcp/system.js.map +1 -1
- package/dist/mcp/tools.d.ts.map +1 -1
- package/dist/mcp/tools.js +287 -4
- package/dist/mcp/tools.js.map +1 -1
- package/dist/mcp/worker-tools.js +1 -1
- package/dist/mcp/worker-tools.js.map +1 -1
- package/dist/ui/App.d.ts.map +1 -1
- package/dist/ui/App.js +4 -4
- package/dist/ui/App.js.map +1 -1
- package/dist/ui/components/InputArea.d.ts +3 -1
- package/dist/ui/components/InputArea.d.ts.map +1 -1
- package/dist/ui/components/InputArea.js +164 -26
- package/dist/ui/components/InputArea.js.map +1 -1
- package/dist/ui/components/ToolCallIndicator.d.ts +23 -0
- package/dist/ui/components/ToolCallIndicator.d.ts.map +1 -1
- package/dist/ui/components/ToolCallIndicator.js +31 -4
- package/dist/ui/components/ToolCallIndicator.js.map +1 -1
- package/dist/ui/components/index.d.ts +2 -1
- package/dist/ui/components/index.d.ts.map +1 -1
- package/dist/ui/components/index.js +1 -1
- package/dist/ui/components/index.js.map +1 -1
- package/dist/ui/hooks/useAgentStream.d.ts +2 -0
- package/dist/ui/hooks/useAgentStream.d.ts.map +1 -1
- package/dist/ui/hooks/useAgentStream.js +41 -8
- package/dist/ui/hooks/useAgentStream.js.map +1 -1
- package/dist/ui/hooks/useCommands.d.ts +4 -5
- package/dist/ui/hooks/useCommands.d.ts.map +1 -1
- package/dist/ui/hooks/useCommands.js +76 -11
- package/dist/ui/hooks/useCommands.js.map +1 -1
- package/dist/utils/config.d.ts +18 -0
- package/dist/utils/config.d.ts.map +1 -1
- package/dist/utils/config.js +39 -3
- package/dist/utils/config.js.map +1 -1
- package/dist/utils/output.d.ts +25 -8
- package/dist/utils/output.d.ts.map +1 -1
- package/dist/utils/output.js +46 -9
- package/dist/utils/output.js.map +1 -1
- package/dist/worker/executors/articulate.d.ts +23 -0
- package/dist/worker/executors/articulate.d.ts.map +1 -0
- package/dist/worker/executors/articulate.js +151 -0
- package/dist/worker/executors/articulate.js.map +1 -0
- package/dist/worker/index.d.ts +1 -0
- package/dist/worker/index.d.ts.map +1 -1
- package/dist/worker/index.js +1 -0
- package/dist/worker/index.js.map +1 -1
- package/dist/worker/service.d.ts +1 -0
- package/dist/worker/service.d.ts.map +1 -1
- package/dist/worker/service.js +8 -0
- package/dist/worker/service.js.map +1 -1
- package/dist/worker/supervisor.d.ts.map +1 -1
- package/dist/worker/supervisor.js +59 -21
- package/dist/worker/supervisor.js.map +1 -1
- package/dist/worker/types.d.ts +3 -1
- package/dist/worker/types.d.ts.map +1 -1
- package/dist/worker/types.js +20 -2
- package/dist/worker/types.js.map +1 -1
- package/package.json +1 -1
package/dist/agent/service.d.ts
CHANGED
|
@@ -11,6 +11,11 @@ export interface StreamOptions {
|
|
|
11
11
|
conversationId?: string;
|
|
12
12
|
mcpState?: McpState;
|
|
13
13
|
cliMode?: Partial<CliModeOptions>;
|
|
14
|
+
references?: Array<{
|
|
15
|
+
type: string;
|
|
16
|
+
id: string;
|
|
17
|
+
content?: string;
|
|
18
|
+
}>;
|
|
14
19
|
}
|
|
15
20
|
/**
|
|
16
21
|
* Agent Service class for streaming communication
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/agent/service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAER,oBAAoB,EACpB,QAAQ,EACR,aAAa,EAChB,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,MAAM,WAAW,aAAa;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/agent/service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAER,oBAAoB,EACpB,QAAQ,EACR,aAAa,EAChB,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,MAAM,WAAW,aAAa;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IAClC,UAAU,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACtE;AAED;;GAEG;AACH,qBAAa,YAAY;IACrB,OAAO,CAAC,eAAe,CAAgC;IAEvD;;OAEG;IACG,aAAa,CACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,oBAAoB,EAC/B,OAAO,CAAC,EAAE,aAAa,GACxB,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;IA4DjC;;OAEG;YACW,aAAa;IA6D3B;;OAEG;YACW,WAAW;IAmKzB;;OAEG;IACG,eAAe,CACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,GACtB,OAAO,CAAC,OAAO,CAAC;IAqBnB;;OAEG;IACH,KAAK,IAAI,IAAI;CAGhB;AAGD,eAAO,MAAM,YAAY,cAAqB,CAAC"}
|
package/dist/agent/service.js
CHANGED
|
@@ -13,7 +13,7 @@ export class AgentService {
|
|
|
13
13
|
*/
|
|
14
14
|
async streamMessage(message, callbacks, options) {
|
|
15
15
|
this.abortController = new AbortController();
|
|
16
|
-
const { conversationId, mcpState } = options || {};
|
|
16
|
+
const { conversationId, mcpState, references } = options || {};
|
|
17
17
|
const token = getToken();
|
|
18
18
|
if (!token) {
|
|
19
19
|
callbacks.onError?.('Authentication required. Run `paean login` first.');
|
|
@@ -32,6 +32,7 @@ export class AgentService {
|
|
|
32
32
|
conversationId,
|
|
33
33
|
mcpState,
|
|
34
34
|
cliMode: options?.cliMode,
|
|
35
|
+
references,
|
|
35
36
|
}),
|
|
36
37
|
signal: this.abortController.signal,
|
|
37
38
|
});
|
|
@@ -215,11 +216,14 @@ export class AgentService {
|
|
|
215
216
|
}
|
|
216
217
|
}
|
|
217
218
|
break;
|
|
218
|
-
case '
|
|
219
|
-
if (event.data.
|
|
220
|
-
callbacks.
|
|
219
|
+
case 'grounding':
|
|
220
|
+
if (event.data.sources && Array.isArray(event.data.sources)) {
|
|
221
|
+
callbacks.onGrounding?.(event.data.sources);
|
|
221
222
|
}
|
|
222
223
|
break;
|
|
224
|
+
case 'done':
|
|
225
|
+
callbacks.onDone?.(event.data.conversationId);
|
|
226
|
+
break;
|
|
223
227
|
case 'error':
|
|
224
228
|
callbacks.onError?.(event.data.error || 'Unknown error');
|
|
225
229
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/agent/service.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/agent/service.ts"],"names":[],"mappings":"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"}
|
package/dist/agent/types.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
/**
|
|
6
6
|
* Agent stream event types from SSE
|
|
7
7
|
*/
|
|
8
|
-
export type AgentStreamEventType = 'content' | 'tool_call' | 'tool_result' | 'mcp_tool_call' | 'sparklet_created' | 'sparklet_ready' | 'done' | 'error';
|
|
8
|
+
export type AgentStreamEventType = 'content' | 'tool_call' | 'tool_result' | 'mcp_tool_call' | 'sparklet_created' | 'sparklet_ready' | 'grounding' | 'done' | 'error';
|
|
9
9
|
/**
|
|
10
10
|
* Agent stream event structure
|
|
11
11
|
*/
|
|
@@ -31,6 +31,11 @@ export interface AgentStreamEvent {
|
|
|
31
31
|
signedUrl?: string;
|
|
32
32
|
generationPrompt?: string;
|
|
33
33
|
aiModel?: string;
|
|
34
|
+
sources?: Array<{
|
|
35
|
+
title?: string;
|
|
36
|
+
url?: string;
|
|
37
|
+
snippet?: string;
|
|
38
|
+
}>;
|
|
34
39
|
error?: string;
|
|
35
40
|
};
|
|
36
41
|
}
|
|
@@ -51,7 +56,12 @@ export interface AgentStreamCallbacks {
|
|
|
51
56
|
generationPrompt?: string;
|
|
52
57
|
aiModel?: string;
|
|
53
58
|
}) => void;
|
|
54
|
-
|
|
59
|
+
onGrounding?: (sources: Array<{
|
|
60
|
+
title?: string;
|
|
61
|
+
url?: string;
|
|
62
|
+
snippet?: string;
|
|
63
|
+
}>) => void;
|
|
64
|
+
onDone?: (conversationId?: string) => void;
|
|
55
65
|
onError?: (error: string) => void;
|
|
56
66
|
}
|
|
57
67
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/agent/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAC1B,SAAS,GACT,WAAW,GACX,aAAa,GACb,eAAe,GACf,kBAAkB,GAClB,gBAAgB,GAChB,MAAM,GACN,OAAO,CAAC;AAEd;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,EAAE;QAEF,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;QAElB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,CAAC;QAEjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,MAAM,CAAC;QAExB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,KAAK,CAAC,EAAE,MAAM,CAAC;QAEf,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;CACL;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACrD,UAAU,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,YAAY,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACpE,aAAa,CAAC,EAAE,CACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5B,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC;QAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,KAAK,IAAI,CAAC;IACX,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/agent/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/agent/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAe,MAAM,mBAAmB,CAAC;AAE9E,MAAM,WAAW,gBAAgB;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC;IACtE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/H,SAAS,CAAC,EAAE,SAAS,CAAC;CACzB,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/agent/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAK7C,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAe,MAAM,mBAAmB,CAAC;AAE9E,MAAM,WAAW,gBAAgB;IAC7B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC;IACtE,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAC/H,SAAS,CAAC,EAAE,SAAS,CAAC;CACzB,CAAC,CAoID;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAK1C"}
|
package/dist/agent/utils.js
CHANGED
|
@@ -21,40 +21,24 @@ export async function initializeAgent(options) {
|
|
|
21
21
|
connected: true,
|
|
22
22
|
tools: builtInTools,
|
|
23
23
|
}];
|
|
24
|
+
// Track which servers need lazy connection
|
|
25
|
+
const pendingServers = new Set();
|
|
24
26
|
if (enableMcp) {
|
|
25
27
|
mcpClient = new McpClient({ debug });
|
|
26
28
|
const serverNames = mcpClient.listServers();
|
|
27
29
|
if (serverNames.length > 0) {
|
|
28
30
|
if (debug) {
|
|
29
|
-
console.log(muted(`[MCP] Found ${serverNames.length} configured server(s)`));
|
|
31
|
+
console.log(muted(`[MCP] Found ${serverNames.length} configured server(s) (lazy connect)`));
|
|
30
32
|
}
|
|
33
|
+
// Register servers as pending - they'll connect on first use
|
|
31
34
|
for (const name of serverNames) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
const tools = await mcpClient.connect(name);
|
|
37
|
-
if (debug) {
|
|
38
|
-
console.log(muted(`[MCP] Connected to ${name}: ${tools.length} tools`));
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
catch (error) {
|
|
42
|
-
const errorMessage = error instanceof Error
|
|
43
|
-
? error.message
|
|
44
|
-
: 'Unknown error';
|
|
45
|
-
console.log(warning(`⚠️ Failed to connect to MCP server "${name}": ${errorMessage}`));
|
|
46
|
-
if (debug) {
|
|
47
|
-
console.log(muted(` Stack: ${error instanceof Error ? error.stack : 'N/A'}`));
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
// Add external MCP servers
|
|
52
|
-
const connectedServers = mcpClient.getConnectedServers();
|
|
53
|
-
for (const name of connectedServers) {
|
|
35
|
+
pendingServers.add(name);
|
|
36
|
+
// Add server entry with empty tools - will be populated on connect
|
|
37
|
+
const configTools = mcpClient.getServerConfigTools(name);
|
|
54
38
|
mcpServers.push({
|
|
55
39
|
name,
|
|
56
|
-
connected:
|
|
57
|
-
tools:
|
|
40
|
+
connected: false,
|
|
41
|
+
tools: configTools || [],
|
|
58
42
|
});
|
|
59
43
|
}
|
|
60
44
|
}
|
|
@@ -63,22 +47,51 @@ export async function initializeAgent(options) {
|
|
|
63
47
|
mcpEnabled: true,
|
|
64
48
|
mcpServers,
|
|
65
49
|
};
|
|
50
|
+
/**
|
|
51
|
+
* Lazy-connect to an MCP server on first tool call
|
|
52
|
+
*/
|
|
53
|
+
const ensureConnected = async (serverName) => {
|
|
54
|
+
if (!mcpClient || !pendingServers.has(serverName))
|
|
55
|
+
return true;
|
|
56
|
+
try {
|
|
57
|
+
if (debug) {
|
|
58
|
+
console.log(muted(`[MCP] Connecting to ${serverName}...`));
|
|
59
|
+
}
|
|
60
|
+
const tools = await mcpClient.connect(serverName);
|
|
61
|
+
pendingServers.delete(serverName);
|
|
62
|
+
// Update mcpServers entry
|
|
63
|
+
const serverEntry = mcpServers.find(s => s.name === serverName);
|
|
64
|
+
if (serverEntry) {
|
|
65
|
+
serverEntry.connected = true;
|
|
66
|
+
serverEntry.tools = Array.from(mcpClient.getAllTools().get(serverName) || []);
|
|
67
|
+
}
|
|
68
|
+
if (debug) {
|
|
69
|
+
console.log(muted(`[MCP] Connected to ${serverName}: ${tools.length} tools`));
|
|
70
|
+
}
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
pendingServers.delete(serverName);
|
|
75
|
+
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
|
|
76
|
+
console.log(warning(`Failed to connect to MCP server "${serverName}": ${errorMessage}`));
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
};
|
|
66
80
|
const onMcpToolCall = async (_callId, serverName, toolName, args) => {
|
|
67
81
|
// Handle built-in paean-system tools
|
|
68
82
|
if (serverName === 'paean-system') {
|
|
69
83
|
try {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
84
|
+
const SYSTEM_TOOLS = new Set([
|
|
85
|
+
'paean_execute_shell', 'paean_check_process', 'paean_kill_process',
|
|
86
|
+
'paean_download_file', 'paean_write_file', 'paean_read_file', 'paean_list_directory',
|
|
87
|
+
]);
|
|
88
|
+
if (SYSTEM_TOOLS.has(toolName) || toolName.startsWith('paean_worker_')) {
|
|
75
89
|
const result = await executeSystemTool(toolName, args, { debug });
|
|
76
90
|
return {
|
|
77
91
|
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
78
92
|
isError: false,
|
|
79
93
|
};
|
|
80
94
|
}
|
|
81
|
-
// Otherwise it's a task management tool
|
|
82
95
|
const result = await executeMcpTool(toolName, args);
|
|
83
96
|
return {
|
|
84
97
|
content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
|
|
@@ -92,13 +105,15 @@ export async function initializeAgent(options) {
|
|
|
92
105
|
};
|
|
93
106
|
}
|
|
94
107
|
}
|
|
95
|
-
// Handle external MCP tools
|
|
108
|
+
// Handle external MCP tools - lazy connect if needed
|
|
96
109
|
if (!mcpClient) {
|
|
97
110
|
return {
|
|
98
111
|
content: [{ type: 'text', text: 'MCP client not available' }],
|
|
99
112
|
isError: true,
|
|
100
113
|
};
|
|
101
114
|
}
|
|
115
|
+
// Lazy connect on first call
|
|
116
|
+
await ensureConnected(serverName);
|
|
102
117
|
return mcpClient.callTool(serverName, toolName, args);
|
|
103
118
|
};
|
|
104
119
|
return { mcpState, onMcpToolCall, mcpClient };
|
package/dist/agent/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/agent/utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAyB;IAK3D,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAE1C,IAAI,QAA8B,CAAC;IACnC,IAAI,SAAgC,CAAC;IAErC,yCAAyC;IACzC,MAAM,YAAY,GAAkB,WAAW,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3D,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;QACnC,WAAW,EAAE,IAAI,CAAC,WAAsC;KAC3D,CAAC,CAAC,CAAC;IAEJ,MAAM,UAAU,GAA2B,CAAC;YACxC,IAAI,EAAE,cAAc;YACpB,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,YAAY;SACtB,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE,CAAC;QACZ,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACrC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QAE5C,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,WAAW,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/agent/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/api/auth.d.ts
CHANGED
|
@@ -64,6 +64,13 @@ export declare function getCurrentUser(): Promise<UserInfo | null>;
|
|
|
64
64
|
* Validate current token
|
|
65
65
|
*/
|
|
66
66
|
export declare function validateToken(): Promise<boolean>;
|
|
67
|
+
/**
|
|
68
|
+
* Login with email and password
|
|
69
|
+
*/
|
|
70
|
+
export declare function emailLogin(email: string, password: string): Promise<{
|
|
71
|
+
success: boolean;
|
|
72
|
+
error?: string;
|
|
73
|
+
}>;
|
|
67
74
|
/**
|
|
68
75
|
* Logout - clear stored credentials
|
|
69
76
|
*/
|
package/dist/api/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/api/auth.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,UAAU,SAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAOpF;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIrF;AAED;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiF/C;AAED;;;GAGG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA+HlF;AAED;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAc/D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAOtD;AAED;;GAEG;AACH,wBAAgB,MAAM,IAAI,IAAI,CAG7B"}
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/api/auth.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,GAAG,MAAM,CAAC;IACjE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE;QACJ,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,UAAU,SAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAOpF;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAIrF;AAED;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiF/C;AAED;;;GAGG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA+HlF;AAED;;GAEG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAc/D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAOtD;AAoCD;;GAEG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA0C/C;AAED;;GAEG;AACH,wBAAgB,MAAM,IAAI,IAAI,CAG7B"}
|
package/dist/api/auth.js
CHANGED
|
@@ -251,6 +251,76 @@ export async function validateToken() {
|
|
|
251
251
|
return false;
|
|
252
252
|
}
|
|
253
253
|
}
|
|
254
|
+
/**
|
|
255
|
+
* Get the server's public key for RSA encryption
|
|
256
|
+
*/
|
|
257
|
+
async function getPublicKey() {
|
|
258
|
+
const client = getPublicApiClient();
|
|
259
|
+
const response = await client.get('/auth/public-key');
|
|
260
|
+
return response.data.publicKey || response.data.key || '';
|
|
261
|
+
}
|
|
262
|
+
/**
|
|
263
|
+
* Encrypt password with RSA public key
|
|
264
|
+
* Falls back to plain text if crypto not available
|
|
265
|
+
*/
|
|
266
|
+
async function encryptPassword(password, publicKey) {
|
|
267
|
+
if (!publicKey)
|
|
268
|
+
return password;
|
|
269
|
+
try {
|
|
270
|
+
const crypto = await import('crypto');
|
|
271
|
+
const buffer = Buffer.from(password, 'utf-8');
|
|
272
|
+
const encrypted = crypto.publicEncrypt({
|
|
273
|
+
key: publicKey,
|
|
274
|
+
padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
|
|
275
|
+
oaepHash: 'sha256',
|
|
276
|
+
}, buffer);
|
|
277
|
+
return encrypted.toString('base64');
|
|
278
|
+
}
|
|
279
|
+
catch {
|
|
280
|
+
// Fall back to plain text if encryption fails
|
|
281
|
+
return password;
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
/**
|
|
285
|
+
* Login with email and password
|
|
286
|
+
*/
|
|
287
|
+
export async function emailLogin(email, password) {
|
|
288
|
+
try {
|
|
289
|
+
// Get public key for password encryption
|
|
290
|
+
let encryptedPassword = password;
|
|
291
|
+
try {
|
|
292
|
+
const publicKey = await getPublicKey();
|
|
293
|
+
if (publicKey) {
|
|
294
|
+
encryptedPassword = await encryptPassword(password, publicKey);
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
catch {
|
|
298
|
+
// Server may not support public key endpoint - send plain
|
|
299
|
+
}
|
|
300
|
+
const client = getPublicApiClient();
|
|
301
|
+
const response = await client.post('/auth/email', {
|
|
302
|
+
email,
|
|
303
|
+
password: encryptedPassword,
|
|
304
|
+
});
|
|
305
|
+
const data = response.data;
|
|
306
|
+
if (data.token) {
|
|
307
|
+
storeAuth({
|
|
308
|
+
token: data.token,
|
|
309
|
+
refreshToken: data.refreshToken,
|
|
310
|
+
userId: data.user?.id,
|
|
311
|
+
email: data.user?.email || email,
|
|
312
|
+
expiresAt: data.expiresAt,
|
|
313
|
+
});
|
|
314
|
+
resetApiClients();
|
|
315
|
+
return { success: true };
|
|
316
|
+
}
|
|
317
|
+
return { success: false, error: 'No token received' };
|
|
318
|
+
}
|
|
319
|
+
catch (error) {
|
|
320
|
+
const message = error instanceof Error ? error.message : 'Unknown error';
|
|
321
|
+
return { success: false, error: message };
|
|
322
|
+
}
|
|
323
|
+
}
|
|
254
324
|
/**
|
|
255
325
|
* Logout - clear stored credentials
|
|
256
326
|
*/
|
package/dist/api/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/api/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/api/auth.ts"],"names":[],"mappings":"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"}
|
package/dist/api/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAc,EAAE,KAAK,aAAa,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAc,EAAE,KAAK,aAAa,EAAoD,MAAM,OAAO,CAAC;AA4CpG,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,aAAa,CAgFrF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,aAAa,CAiCrD;AA4DD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,aAAa,CAKlF;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,aAAa,CAE1D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,aAAa,CAKlD;AAED;;GAEG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAGtC"}
|
package/dist/api/client.js
CHANGED
|
@@ -6,7 +6,29 @@ import axios from 'axios';
|
|
|
6
6
|
import { readFileSync } from 'fs';
|
|
7
7
|
import { fileURLToPath } from 'url';
|
|
8
8
|
import { dirname, join } from 'path';
|
|
9
|
-
import { getToken, getApiUrl, clearAuth } from '../utils/config.js';
|
|
9
|
+
import { getToken, getApiUrl, clearAuth, getRefreshToken, isTokenNearExpiry, storeAuth } from '../utils/config.js';
|
|
10
|
+
/**
|
|
11
|
+
* Retry configuration
|
|
12
|
+
*/
|
|
13
|
+
const MAX_RETRIES = 3;
|
|
14
|
+
const RETRY_BASE_DELAY_MS = 1000;
|
|
15
|
+
const RETRYABLE_STATUS_CODES = new Set([408, 429, 500, 502, 503, 504]);
|
|
16
|
+
/**
|
|
17
|
+
* Check if an error is retryable
|
|
18
|
+
*/
|
|
19
|
+
function isRetryableError(error) {
|
|
20
|
+
if (!error.response) {
|
|
21
|
+
// Network errors (ECONNREFUSED, ENOTFOUND, ETIMEDOUT, etc.)
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
return RETRYABLE_STATUS_CODES.has(error.response.status);
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Sleep for a given duration
|
|
28
|
+
*/
|
|
29
|
+
function sleep(ms) {
|
|
30
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
31
|
+
}
|
|
10
32
|
// Get version from package.json
|
|
11
33
|
const __filename = fileURLToPath(import.meta.url);
|
|
12
34
|
const __dirname = dirname(__filename);
|
|
@@ -34,21 +56,47 @@ export function createApiClient(options) {
|
|
|
34
56
|
'User-Agent': `Paean-CLI/${cliVersion}`,
|
|
35
57
|
},
|
|
36
58
|
});
|
|
37
|
-
// Add auth token to requests
|
|
38
|
-
client.interceptors.request.use((config) => {
|
|
59
|
+
// Add auth token to requests, with proactive refresh
|
|
60
|
+
client.interceptors.request.use(async (config) => {
|
|
61
|
+
// Proactively refresh token if near expiry
|
|
62
|
+
if (isTokenNearExpiry()) {
|
|
63
|
+
await refreshAuthToken();
|
|
64
|
+
}
|
|
39
65
|
const token = getToken();
|
|
40
66
|
if (token) {
|
|
41
67
|
config.headers.Authorization = `Bearer ${token}`;
|
|
42
68
|
}
|
|
43
69
|
return config;
|
|
44
70
|
});
|
|
45
|
-
// Handle response errors
|
|
46
|
-
client.interceptors.response.use((response) => response, (error) => {
|
|
47
|
-
//
|
|
48
|
-
// Only clear auth if clearAuthOn401 is true (default behavior)
|
|
71
|
+
// Handle response errors with token refresh on 401 and retry on transient errors
|
|
72
|
+
client.interceptors.response.use((response) => response, async (error) => {
|
|
73
|
+
// On 401, attempt token refresh before giving up
|
|
49
74
|
if (error.response?.status === 401 && clearAuthOn401) {
|
|
75
|
+
const refreshToken = getRefreshToken();
|
|
76
|
+
if (refreshToken && error.config && !error.config._retried) {
|
|
77
|
+
const refreshed = await refreshAuthToken();
|
|
78
|
+
if (refreshed) {
|
|
79
|
+
const config = error.config;
|
|
80
|
+
config._retried = true;
|
|
81
|
+
const token = getToken();
|
|
82
|
+
if (token) {
|
|
83
|
+
config.headers.Authorization = `Bearer ${token}`;
|
|
84
|
+
}
|
|
85
|
+
return client.request(config);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
50
88
|
clearAuth();
|
|
51
89
|
}
|
|
90
|
+
// Retry on transient errors with exponential backoff
|
|
91
|
+
if (error.config && isRetryableError(error)) {
|
|
92
|
+
const config = error.config;
|
|
93
|
+
config._retryCount = (config._retryCount || 0) + 1;
|
|
94
|
+
if (config._retryCount <= MAX_RETRIES) {
|
|
95
|
+
const delay = RETRY_BASE_DELAY_MS * Math.pow(2, config._retryCount - 1);
|
|
96
|
+
await sleep(delay);
|
|
97
|
+
return client.request(config);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
52
100
|
// Extract error message
|
|
53
101
|
const errorMessage = error.response?.data?.error ||
|
|
54
102
|
error.response?.data?.message ||
|
|
@@ -88,6 +136,52 @@ export function createPublicApiClient() {
|
|
|
88
136
|
});
|
|
89
137
|
return client;
|
|
90
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* Refresh the authentication token using the refresh token
|
|
141
|
+
* Returns true if refresh was successful
|
|
142
|
+
*/
|
|
143
|
+
let isRefreshing = false;
|
|
144
|
+
let refreshPromise = null;
|
|
145
|
+
async function refreshAuthToken() {
|
|
146
|
+
if (isRefreshing && refreshPromise) {
|
|
147
|
+
return refreshPromise;
|
|
148
|
+
}
|
|
149
|
+
const refreshToken = getRefreshToken();
|
|
150
|
+
if (!refreshToken)
|
|
151
|
+
return false;
|
|
152
|
+
isRefreshing = true;
|
|
153
|
+
refreshPromise = (async () => {
|
|
154
|
+
try {
|
|
155
|
+
const response = await axios.post(`${getApiUrl()}/auth/refresh-token`, {
|
|
156
|
+
refreshToken,
|
|
157
|
+
}, {
|
|
158
|
+
headers: {
|
|
159
|
+
'Content-Type': 'application/json',
|
|
160
|
+
'User-Agent': `Paean-CLI/${cliVersion}`,
|
|
161
|
+
},
|
|
162
|
+
timeout: 10000,
|
|
163
|
+
});
|
|
164
|
+
const data = response.data;
|
|
165
|
+
if (data.token) {
|
|
166
|
+
storeAuth({
|
|
167
|
+
token: data.token,
|
|
168
|
+
refreshToken: data.refreshToken,
|
|
169
|
+
expiresAt: data.expiresAt,
|
|
170
|
+
});
|
|
171
|
+
return true;
|
|
172
|
+
}
|
|
173
|
+
return false;
|
|
174
|
+
}
|
|
175
|
+
catch {
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
finally {
|
|
179
|
+
isRefreshing = false;
|
|
180
|
+
refreshPromise = null;
|
|
181
|
+
}
|
|
182
|
+
})();
|
|
183
|
+
return refreshPromise;
|
|
184
|
+
}
|
|
91
185
|
// Singleton instances
|
|
92
186
|
let apiClient = null;
|
|
93
187
|
let publicApiClient = null;
|
package/dist/api/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/api/client.ts"],"names":[],"mappings":"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"}
|