codevf 1.0.1 → 1.0.3
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 +118 -62
- package/dist/commands/chat.d.ts +2 -0
- package/dist/commands/chat.d.ts.map +1 -0
- package/dist/commands/chat.js +130 -0
- package/dist/commands/chat.js.map +1 -0
- package/dist/commands/cvf-chat-command-content.d.ts +2 -0
- package/dist/commands/cvf-chat-command-content.d.ts.map +1 -0
- package/dist/commands/cvf-chat-command-content.js +22 -0
- package/dist/commands/cvf-chat-command-content.js.map +1 -0
- package/dist/commands/cvf-command-content.d.ts +2 -0
- package/dist/commands/cvf-command-content.d.ts.map +1 -0
- package/dist/commands/cvf-command-content.js +109 -0
- package/dist/commands/cvf-command-content.js.map +1 -0
- package/dist/commands/fix.d.ts +1 -0
- package/dist/commands/fix.d.ts.map +1 -1
- package/dist/commands/fix.js +36 -0
- package/dist/commands/fix.js.map +1 -1
- package/dist/commands/listen.d.ts +2 -0
- package/dist/commands/listen.d.ts.map +1 -0
- package/dist/commands/listen.js +109 -0
- package/dist/commands/listen.js.map +1 -0
- package/dist/commands/mcp-tools.d.ts.map +1 -1
- package/dist/commands/mcp-tools.js +15 -15
- package/dist/commands/mcp-tools.js.map +1 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +138 -56
- package/dist/commands/setup.js.map +1 -1
- package/dist/index.js +130 -92
- package/dist/index.js.map +1 -1
- package/dist/lib/api/client.d.ts +4 -0
- package/dist/lib/api/client.d.ts.map +1 -1
- package/dist/lib/api/client.js +6 -0
- package/dist/lib/api/client.js.map +1 -1
- package/dist/lib/api/projects.d.ts +32 -0
- package/dist/lib/api/projects.d.ts.map +1 -0
- package/dist/lib/api/projects.js +61 -0
- package/dist/lib/api/projects.js.map +1 -0
- package/dist/lib/api/sessions.d.ts +85 -0
- package/dist/lib/api/sessions.d.ts.map +1 -0
- package/dist/lib/api/sessions.js +137 -0
- package/dist/lib/api/sessions.js.map +1 -0
- package/dist/lib/api/tasks.d.ts +44 -0
- package/dist/lib/api/tasks.d.ts.map +1 -1
- package/dist/lib/api/tasks.js +82 -1
- package/dist/lib/api/tasks.js.map +1 -1
- package/dist/lib/api/websocket.d.ts +4 -2
- package/dist/lib/api/websocket.d.ts.map +1 -1
- package/dist/lib/api/websocket.js +54 -5
- package/dist/lib/api/websocket.js.map +1 -1
- package/dist/lib/auth/token-manager.d.ts.map +1 -1
- package/dist/lib/auth/token-manager.js +17 -6
- package/dist/lib/auth/token-manager.js.map +1 -1
- package/dist/lib/utils/logger.d.ts +3 -0
- package/dist/lib/utils/logger.d.ts.map +1 -1
- package/dist/lib/utils/logger.js +12 -4
- package/dist/lib/utils/logger.js.map +1 -1
- package/dist/mcp/index.js +136 -8
- package/dist/mcp/index.js.map +1 -1
- package/dist/mcp/tools/chat.d.ts +81 -1
- package/dist/mcp/tools/chat.d.ts.map +1 -1
- package/dist/mcp/tools/chat.js +624 -21
- package/dist/mcp/tools/chat.js.map +1 -1
- package/dist/mcp/tools/instant.d.ts +20 -5
- package/dist/mcp/tools/instant.d.ts.map +1 -1
- package/dist/mcp/tools/instant.js +322 -27
- package/dist/mcp/tools/instant.js.map +1 -1
- package/dist/mcp/tools/listen.d.ts +35 -0
- package/dist/mcp/tools/listen.d.ts.map +1 -0
- package/dist/mcp/tools/listen.js +97 -0
- package/dist/mcp/tools/listen.js.map +1 -0
- package/dist/mcp/tools/task-checker.d.ts +60 -0
- package/dist/mcp/tools/task-checker.d.ts.map +1 -0
- package/dist/mcp/tools/task-checker.js +139 -0
- package/dist/mcp/tools/task-checker.js.map +1 -0
- package/dist/mcp/tools/tunnel.d.ts +38 -0
- package/dist/mcp/tools/tunnel.d.ts.map +1 -0
- package/dist/mcp/tools/tunnel.js +109 -0
- package/dist/mcp/tools/tunnel.js.map +1 -0
- package/dist/modules/commandHandler.d.ts.map +1 -1
- package/dist/modules/commandHandler.js +0 -17
- package/dist/modules/commandHandler.js.map +1 -1
- package/dist/modules/permissions.d.ts +1 -0
- package/dist/modules/permissions.d.ts.map +1 -1
- package/dist/modules/permissions.js +2 -0
- package/dist/modules/permissions.js.map +1 -1
- package/dist/modules/tunnel.d.ts +5 -0
- package/dist/modules/tunnel.d.ts.map +1 -1
- package/dist/modules/tunnel.js +55 -0
- package/dist/modules/tunnel.js.map +1 -1
- package/dist/modules/websocket.d.ts.map +1 -1
- package/dist/modules/websocket.js +3 -2
- package/dist/modules/websocket.js.map +1 -1
- package/dist/types/index.d.ts +7 -3
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/ui/LiveSession.js +2 -2
- package/dist/ui/LiveSession.js.map +1 -1
- package/dist/ui/SessionUI.d.ts +1 -1
- package/dist/ui/SessionUI.d.ts.map +1 -1
- package/dist/ui/SessionUI.js +4 -10
- package/dist/ui/SessionUI.js.map +1 -1
- package/dist/utils/errors.d.ts.map +1 -1
- package/dist/utils/errors.js +8 -7
- package/dist/utils/errors.js.map +1 -1
- package/package.json +4 -3
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Session API - Chat session management
|
|
3
|
+
*/
|
|
4
|
+
import { logger } from '../utils/logger.js';
|
|
5
|
+
export class SessionsApi {
|
|
6
|
+
constructor(client, baseUrl) {
|
|
7
|
+
this.client = client;
|
|
8
|
+
this.baseUrl = baseUrl;
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* Get or verify session exists for a task ID
|
|
12
|
+
* Task ID is just the integer ID from projectActions
|
|
13
|
+
*/
|
|
14
|
+
async getSession(taskId, options) {
|
|
15
|
+
const taskIdStr = taskId.toString();
|
|
16
|
+
const params = new URLSearchParams();
|
|
17
|
+
if (options?.limit)
|
|
18
|
+
params.set('limit', options.limit.toString());
|
|
19
|
+
if (options?.offset)
|
|
20
|
+
params.set('offset', options.offset.toString());
|
|
21
|
+
const queryString = params.toString();
|
|
22
|
+
const path = `/api/session/${taskIdStr}${queryString ? `?${queryString}` : ''}`;
|
|
23
|
+
logger.debug('Getting session', { taskId: taskIdStr, path });
|
|
24
|
+
const response = await this.client.get(path);
|
|
25
|
+
if (!response.success || !response.data) {
|
|
26
|
+
throw new Error(response.error || 'Failed to get session');
|
|
27
|
+
}
|
|
28
|
+
logger.info('Session retrieved', {
|
|
29
|
+
sessionId: response.data.sessionId,
|
|
30
|
+
messageCount: response.data.messages.length,
|
|
31
|
+
status: response.data.action.status,
|
|
32
|
+
});
|
|
33
|
+
return response.data;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Check if a session exists for a task ID
|
|
37
|
+
* Returns true if session exists and is active, false otherwise
|
|
38
|
+
*/
|
|
39
|
+
async sessionExists(taskId) {
|
|
40
|
+
try {
|
|
41
|
+
const session = await this.getSession(taskId);
|
|
42
|
+
const activeStatuses = [
|
|
43
|
+
'requested',
|
|
44
|
+
'estimated',
|
|
45
|
+
'approved',
|
|
46
|
+
'in_progress',
|
|
47
|
+
'waiting_response',
|
|
48
|
+
];
|
|
49
|
+
return activeStatuses.includes(session.action.status);
|
|
50
|
+
}
|
|
51
|
+
catch (error) {
|
|
52
|
+
logger.debug('Session check failed', { taskId, error: error.message });
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Get all messages for a session
|
|
58
|
+
*/
|
|
59
|
+
async getMessages(taskId) {
|
|
60
|
+
const taskIdStr = taskId.toString();
|
|
61
|
+
const path = `/api/session/${taskIdStr}/messages`;
|
|
62
|
+
logger.debug('Getting session messages', { taskId: taskIdStr });
|
|
63
|
+
const response = await this.client.get(path);
|
|
64
|
+
if (!response.success || !response.data) {
|
|
65
|
+
throw new Error(response.error || 'Failed to get messages');
|
|
66
|
+
}
|
|
67
|
+
logger.info('Messages retrieved', {
|
|
68
|
+
taskId: taskIdStr,
|
|
69
|
+
count: response.data.messages.length,
|
|
70
|
+
});
|
|
71
|
+
return response.data.messages;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Send a message in a session
|
|
75
|
+
*/
|
|
76
|
+
async sendMessage(taskId, request) {
|
|
77
|
+
const taskIdStr = taskId.toString();
|
|
78
|
+
const path = `/api/session/${taskIdStr}/messages`;
|
|
79
|
+
logger.debug('Sending message', {
|
|
80
|
+
taskId: taskIdStr,
|
|
81
|
+
sender: request.sender,
|
|
82
|
+
contentLength: request.content.length,
|
|
83
|
+
});
|
|
84
|
+
const response = await this.client.post(path, request);
|
|
85
|
+
if (!response.success || !response.data) {
|
|
86
|
+
throw new Error(response.error || 'Failed to send message');
|
|
87
|
+
}
|
|
88
|
+
logger.info('Message sent', {
|
|
89
|
+
taskId: taskIdStr,
|
|
90
|
+
messageId: response.data.message.id,
|
|
91
|
+
sender: response.data.message.sender,
|
|
92
|
+
});
|
|
93
|
+
return response.data.message;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Cancel a session
|
|
97
|
+
*/
|
|
98
|
+
async cancelSession(taskId) {
|
|
99
|
+
const taskIdStr = taskId.toString();
|
|
100
|
+
const path = `/api/session/${taskIdStr}/cancel`;
|
|
101
|
+
logger.debug('Cancelling session', { taskId: taskIdStr });
|
|
102
|
+
const response = await this.client.post(path);
|
|
103
|
+
if (!response.success) {
|
|
104
|
+
throw new Error(response.error || 'Failed to cancel session');
|
|
105
|
+
}
|
|
106
|
+
logger.info('Session cancelled', { taskId: taskIdStr });
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Get WebSocket URL for session
|
|
110
|
+
*/
|
|
111
|
+
getWebSocketUrl(taskId, userType) {
|
|
112
|
+
const wsUrl = this.baseUrl.replace('http://', 'ws://').replace('https://', 'wss://');
|
|
113
|
+
return `${wsUrl}/ws?taskId=${taskId}&userType=${userType}`;
|
|
114
|
+
}
|
|
115
|
+
/**
|
|
116
|
+
* Helper: Get session info formatted for display
|
|
117
|
+
*/
|
|
118
|
+
async getSessionInfo(taskId) {
|
|
119
|
+
const session = await this.getSession(taskId);
|
|
120
|
+
let info = `Session: ${session.sessionId}\n`;
|
|
121
|
+
info += `Status: ${session.action.status}\n`;
|
|
122
|
+
info += `Mode: ${session.action.mode}\n`;
|
|
123
|
+
info += `Credits: ${session.action.actualCreditsUsed || 0} / ${session.action.maxCredits}\n`;
|
|
124
|
+
if (session.engineer) {
|
|
125
|
+
info += `Engineer: ${session.engineer.name} (${session.engineer.email})\n`;
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
info += `Engineer: Not assigned yet\n`;
|
|
129
|
+
}
|
|
130
|
+
info += `Messages: ${session.messages.length}\n`;
|
|
131
|
+
if (session.project?.repoUrl) {
|
|
132
|
+
info += `Repository: ${session.project.repoUrl}\n`;
|
|
133
|
+
}
|
|
134
|
+
return info;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
//# sourceMappingURL=sessions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/lib/api/sessions.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/api/tasks.d.ts
CHANGED
|
@@ -8,8 +8,11 @@ export interface CreateTaskOptions {
|
|
|
8
8
|
taskMode: TaskMode;
|
|
9
9
|
maxCredits: number;
|
|
10
10
|
projectId?: string;
|
|
11
|
+
status?: string;
|
|
11
12
|
contextData?: any;
|
|
12
13
|
initiatedBy?: string;
|
|
14
|
+
assignmentTimeoutSeconds?: number;
|
|
15
|
+
parentActionId?: string;
|
|
13
16
|
}
|
|
14
17
|
export interface CreateTaskResult {
|
|
15
18
|
taskId: string;
|
|
@@ -19,6 +22,19 @@ export interface CreateTaskResult {
|
|
|
19
22
|
maxCreditsAllocated: number;
|
|
20
23
|
warning?: string;
|
|
21
24
|
}
|
|
25
|
+
export interface TaskMessage {
|
|
26
|
+
id?: string | number;
|
|
27
|
+
sender?: string;
|
|
28
|
+
content?: string;
|
|
29
|
+
timestamp?: string;
|
|
30
|
+
}
|
|
31
|
+
export interface TaskStatus {
|
|
32
|
+
status: string;
|
|
33
|
+
actualCreditsUsed?: number | null;
|
|
34
|
+
response?: string | null;
|
|
35
|
+
messages?: TaskMessage[];
|
|
36
|
+
completedAt?: string | null;
|
|
37
|
+
}
|
|
22
38
|
export declare class TasksApi {
|
|
23
39
|
private client;
|
|
24
40
|
private baseUrl;
|
|
@@ -28,9 +44,37 @@ export declare class TasksApi {
|
|
|
28
44
|
* Create a new task
|
|
29
45
|
*/
|
|
30
46
|
create(options: CreateTaskOptions): Promise<CreateTaskResult>;
|
|
47
|
+
/**
|
|
48
|
+
* Get active or requesting tasks (not completed)
|
|
49
|
+
*/
|
|
50
|
+
getActiveTasks(projectId?: string): Promise<any[]>;
|
|
31
51
|
/**
|
|
32
52
|
* Get task status
|
|
33
53
|
*/
|
|
34
54
|
getStatus(taskId: string): Promise<any>;
|
|
55
|
+
/**
|
|
56
|
+
* Get parent task chain up to 4 levels deep
|
|
57
|
+
*/
|
|
58
|
+
getParentTaskChain(projectId: string, taskId?: string): Promise<{
|
|
59
|
+
taskId: string | null;
|
|
60
|
+
hasParent: boolean;
|
|
61
|
+
parentChain: Array<{
|
|
62
|
+
taskId: string;
|
|
63
|
+
mode: string;
|
|
64
|
+
status: string;
|
|
65
|
+
message: string;
|
|
66
|
+
}>;
|
|
67
|
+
}>;
|
|
68
|
+
/**
|
|
69
|
+
* Poll for an engineer response
|
|
70
|
+
*/
|
|
71
|
+
waitForResponse(taskId: string, options?: {
|
|
72
|
+
timeoutMs?: number;
|
|
73
|
+
pollIntervalMs?: number;
|
|
74
|
+
}): Promise<{
|
|
75
|
+
text: string;
|
|
76
|
+
creditsUsed: number;
|
|
77
|
+
duration: string;
|
|
78
|
+
}>;
|
|
35
79
|
}
|
|
36
80
|
//# sourceMappingURL=tasks.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../src/lib/api/tasks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,MAAM,MAAM,QAAQ,GAAG,iBAAiB,GAAG,eAAe,GAAG,MAAM,GAAG,UAAU,CAAC;AAEjF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../src/lib/api/tasks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,MAAM,MAAM,QAAQ,GAAG,iBAAiB,GAAG,eAAe,GAAG,MAAM,GAAG,UAAU,CAAC;AAEjF,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,gBAAgB,CAAS;gBAErB,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM;IAMzE;;OAEG;IACG,MAAM,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA+CnE;;OAEG;IACG,cAAc,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAaxD;;OAEG;IACG,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAW7C;;OAEG;IACG,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;QACpE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,SAAS,EAAE,OAAO,CAAC;QACnB,WAAW,EAAE,KAAK,CAAC;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KACvF,CAAC;IAcF;;OAEG;IACG,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAO,GAC5D,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CAwDpE"}
|
package/dist/lib/api/tasks.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Task creation and management API wrapper
|
|
3
3
|
*/
|
|
4
|
-
import { InsufficientCreditsError } from '../utils/errors.js';
|
|
4
|
+
import { InsufficientCreditsError, TimeoutError } from '../utils/errors.js';
|
|
5
5
|
import { logger } from '../utils/logger.js';
|
|
6
6
|
export class TasksApi {
|
|
7
7
|
constructor(client, baseUrl, defaultProjectId) {
|
|
@@ -16,15 +16,21 @@ export class TasksApi {
|
|
|
16
16
|
logger.info('Creating task', {
|
|
17
17
|
mode: options.taskMode,
|
|
18
18
|
maxCredits: options.maxCredits,
|
|
19
|
+
requestedProjectId: options.projectId,
|
|
20
|
+
defaultProjectId: this.defaultProjectId,
|
|
21
|
+
assignmentTimeoutSeconds: options.assignmentTimeoutSeconds,
|
|
19
22
|
});
|
|
20
23
|
const response = await this.client.post('/api/cli/tasks/create', {
|
|
21
24
|
issueDescription: options.message,
|
|
22
25
|
taskMode: options.taskMode,
|
|
23
26
|
maxCredits: options.maxCredits,
|
|
27
|
+
status: options.status ?? 'requested',
|
|
24
28
|
projectId: options.projectId || this.defaultProjectId,
|
|
25
29
|
contextData: options.contextData ? JSON.stringify(options.contextData) : null,
|
|
26
30
|
initiatedBy: options.initiatedBy || 'ai_tool',
|
|
27
31
|
autoApproveCommands: false,
|
|
32
|
+
assignmentTimeoutSeconds: options.assignmentTimeoutSeconds, // Always send if provided
|
|
33
|
+
parentActionId: options.parentActionId ? parseInt(options.parentActionId) : undefined,
|
|
28
34
|
});
|
|
29
35
|
if (!response.success || !response.data) {
|
|
30
36
|
// Check for credit errors
|
|
@@ -47,6 +53,19 @@ export class TasksApi {
|
|
|
47
53
|
warning: response.warning,
|
|
48
54
|
};
|
|
49
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Get active or requesting tasks (not completed)
|
|
58
|
+
*/
|
|
59
|
+
async getActiveTasks(projectId) {
|
|
60
|
+
logger.debug('Getting active tasks', { projectId });
|
|
61
|
+
const response = await this.client.post('/api/cli/tasks/active', {
|
|
62
|
+
projectId: projectId || this.defaultProjectId,
|
|
63
|
+
});
|
|
64
|
+
if (!response.success) {
|
|
65
|
+
throw new Error(response.error || 'Failed to get active tasks');
|
|
66
|
+
}
|
|
67
|
+
return response.data || [];
|
|
68
|
+
}
|
|
50
69
|
/**
|
|
51
70
|
* Get task status
|
|
52
71
|
*/
|
|
@@ -58,5 +77,67 @@ export class TasksApi {
|
|
|
58
77
|
}
|
|
59
78
|
return response.data;
|
|
60
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* Get parent task chain up to 4 levels deep
|
|
82
|
+
*/
|
|
83
|
+
async getParentTaskChain(projectId, taskId) {
|
|
84
|
+
logger.debug('Getting parent task chain', { projectId, taskId });
|
|
85
|
+
const response = await this.client.post('/api/cli/tasks/parents', {
|
|
86
|
+
projectId: projectId || this.defaultProjectId,
|
|
87
|
+
taskId: taskId,
|
|
88
|
+
});
|
|
89
|
+
if (!response.success) {
|
|
90
|
+
throw new Error(response.error || 'Failed to get parent task chain');
|
|
91
|
+
}
|
|
92
|
+
return response.data;
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Poll for an engineer response
|
|
96
|
+
*/
|
|
97
|
+
async waitForResponse(taskId, options = {}) {
|
|
98
|
+
const timeoutMs = options.timeoutMs ?? 300000;
|
|
99
|
+
const pollIntervalMs = options.pollIntervalMs ?? 3000;
|
|
100
|
+
const startTime = Date.now();
|
|
101
|
+
const seenMessageIds = new Set();
|
|
102
|
+
let responseText = '';
|
|
103
|
+
let creditsUsed = 0;
|
|
104
|
+
while (Date.now() - startTime < timeoutMs) {
|
|
105
|
+
const status = (await this.getStatus(taskId));
|
|
106
|
+
if (typeof status.actualCreditsUsed === 'number') {
|
|
107
|
+
creditsUsed = status.actualCreditsUsed;
|
|
108
|
+
}
|
|
109
|
+
if (Array.isArray(status.messages)) {
|
|
110
|
+
for (const message of status.messages) {
|
|
111
|
+
if (message.sender !== 'engineer') {
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
114
|
+
const messageId = String(message.id ?? message.timestamp ?? message.content ?? '');
|
|
115
|
+
if (!messageId || seenMessageIds.has(messageId)) {
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
seenMessageIds.add(messageId);
|
|
119
|
+
if (message.content) {
|
|
120
|
+
responseText += `${message.content}\n`;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
if (status.response && !responseText.includes(status.response)) {
|
|
125
|
+
responseText += `${responseText ? '\n' : ''}${status.response}\n`;
|
|
126
|
+
}
|
|
127
|
+
if (status.status === 'completed') {
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
|
|
131
|
+
}
|
|
132
|
+
if (Date.now() - startTime >= timeoutMs) {
|
|
133
|
+
throw new TimeoutError('Timeout waiting for engineer response');
|
|
134
|
+
}
|
|
135
|
+
const duration = Math.ceil((Date.now() - startTime) / 60000);
|
|
136
|
+
return {
|
|
137
|
+
text: responseText.trim(),
|
|
138
|
+
creditsUsed,
|
|
139
|
+
duration: `${duration} min`,
|
|
140
|
+
};
|
|
141
|
+
}
|
|
61
142
|
}
|
|
62
143
|
//# sourceMappingURL=tasks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/lib/api/tasks.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/lib/api/tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,10 @@ export interface WebSocketMessage {
|
|
|
8
8
|
payload: any;
|
|
9
9
|
}
|
|
10
10
|
export interface EngineerMessage {
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
content: string;
|
|
12
|
+
text?: string;
|
|
13
|
+
id?: string;
|
|
14
|
+
sender?: string;
|
|
13
15
|
}
|
|
14
16
|
export interface BillingUpdate {
|
|
15
17
|
creditsUsed: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../../src/lib/api/websocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,GAAG,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket.d.ts","sourceRoot":"","sources":["../../../src/lib/api/websocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,GAAG,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,oBAAoB,CAAK;IACjC,OAAO,CAAC,gBAAgB,CAAS;gBAErB,GAAG,EAAE,MAAM;IAKvB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4D9B;;OAEG;IACH,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IASrC;;OAEG;IACH,UAAU,IAAI,IAAI;IAWlB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAkBxB;;OAEG;IACG,eAAe,CAAC,SAAS,GAAE,MAAe,GAAG,OAAO,CAAC;QACzD,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CA+FH"}
|
|
@@ -36,6 +36,9 @@ export class WebSocketClient extends EventEmitter {
|
|
|
36
36
|
case 'engineer_message':
|
|
37
37
|
this.emit('engineer_message', message.payload);
|
|
38
38
|
break;
|
|
39
|
+
case 'session_end':
|
|
40
|
+
this.emit('session_end', message.payload);
|
|
41
|
+
break;
|
|
39
42
|
case 'billing_update':
|
|
40
43
|
this.emit('billing_update', message.payload);
|
|
41
44
|
break;
|
|
@@ -113,13 +116,33 @@ export class WebSocketClient extends EventEmitter {
|
|
|
113
116
|
let responseText = '';
|
|
114
117
|
let creditsUsed = 0;
|
|
115
118
|
const startTime = Date.now();
|
|
119
|
+
let hasReceivedMessage = false;
|
|
116
120
|
const onEngineerMessage = (msg) => {
|
|
117
|
-
|
|
121
|
+
const content = msg.content ?? msg.text ?? '';
|
|
122
|
+
responseText += content + '\n';
|
|
123
|
+
hasReceivedMessage = true;
|
|
118
124
|
};
|
|
119
125
|
const onBillingUpdate = (update) => {
|
|
120
126
|
creditsUsed = update.creditsUsed;
|
|
121
127
|
};
|
|
122
128
|
const onClosureRequest = () => {
|
|
129
|
+
if (!hasResolvedOrRejected) {
|
|
130
|
+
cleanup();
|
|
131
|
+
const duration = Math.ceil((Date.now() - startTime) / 60000);
|
|
132
|
+
hasResolvedOrRejected = true;
|
|
133
|
+
logger.info('[WebSocket] Received closure request, resolving response', {
|
|
134
|
+
duration,
|
|
135
|
+
creditsUsed,
|
|
136
|
+
textLength: responseText.length,
|
|
137
|
+
});
|
|
138
|
+
resolve({
|
|
139
|
+
text: responseText.trim(),
|
|
140
|
+
creditsUsed,
|
|
141
|
+
duration: `${duration} min`,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
};
|
|
145
|
+
const onSessionEnd = () => {
|
|
123
146
|
cleanup();
|
|
124
147
|
const duration = Math.ceil((Date.now() - startTime) / 60000);
|
|
125
148
|
resolve({
|
|
@@ -129,23 +152,49 @@ export class WebSocketClient extends EventEmitter {
|
|
|
129
152
|
});
|
|
130
153
|
};
|
|
131
154
|
const onError = (error) => {
|
|
132
|
-
|
|
133
|
-
|
|
155
|
+
if (!hasResolvedOrRejected) {
|
|
156
|
+
cleanup();
|
|
157
|
+
hasResolvedOrRejected = true;
|
|
158
|
+
logger.error('[WebSocket] Connection error while waiting for response', error);
|
|
159
|
+
reject(new SessionError(`WebSocket error: ${error.message}`));
|
|
160
|
+
}
|
|
134
161
|
};
|
|
162
|
+
let hasResolvedOrRejected = false;
|
|
135
163
|
const cleanup = () => {
|
|
136
164
|
this.off('engineer_message', onEngineerMessage);
|
|
137
165
|
this.off('billing_update', onBillingUpdate);
|
|
138
166
|
this.off('closure_request', onClosureRequest);
|
|
167
|
+
this.off('session_end', onSessionEnd);
|
|
139
168
|
this.off('error', onError);
|
|
140
169
|
clearTimeout(timeoutHandle);
|
|
141
170
|
};
|
|
142
171
|
this.on('engineer_message', onEngineerMessage);
|
|
143
172
|
this.on('billing_update', onBillingUpdate);
|
|
144
173
|
this.on('closure_request', onClosureRequest);
|
|
174
|
+
this.on('session_end', onSessionEnd);
|
|
145
175
|
this.on('error', onError);
|
|
146
176
|
const timeoutHandle = setTimeout(() => {
|
|
147
|
-
|
|
148
|
-
|
|
177
|
+
if (!hasResolvedOrRejected) {
|
|
178
|
+
cleanup();
|
|
179
|
+
hasResolvedOrRejected = true;
|
|
180
|
+
logger.warn('[WebSocket] Timeout waiting for closure request', {
|
|
181
|
+
hasReceivedMessage,
|
|
182
|
+
timeoutMs,
|
|
183
|
+
receivedText: responseText.substring(0, 100)
|
|
184
|
+
});
|
|
185
|
+
if (hasReceivedMessage) {
|
|
186
|
+
// If we got a message but timed out waiting for closure, return what we have
|
|
187
|
+
const duration = Math.ceil((Date.now() - startTime) / 60000);
|
|
188
|
+
resolve({
|
|
189
|
+
text: responseText.trim(),
|
|
190
|
+
creditsUsed,
|
|
191
|
+
duration: `${duration} min`,
|
|
192
|
+
});
|
|
193
|
+
}
|
|
194
|
+
else {
|
|
195
|
+
reject(new TimeoutError('Timeout waiting for engineer response'));
|
|
196
|
+
}
|
|
197
|
+
}
|
|
149
198
|
}, timeoutMs);
|
|
150
199
|
});
|
|
151
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/lib/api/websocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../../../src/lib/api/websocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/token-manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAgB,MAAM,sBAAsB,CAAC;AAInE,qBAAa,YAAY;IACvB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,kBAAkB,CAAkB;gBAEhC,aAAa,EAAE,aAAa;IAIxC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAyBtC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"token-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/token-manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAgB,MAAM,sBAAsB,CAAC;AAInE,qBAAa,YAAY;IACvB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,kBAAkB,CAAkB;gBAEhC,aAAa,EAAE,aAAa;IAIxC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAyBtC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuD9B;;OAEG;IACH,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAM3C;;OAEG;IACH,eAAe,IAAI,OAAO;CAQ3B"}
|
|
@@ -20,9 +20,11 @@ export class TokenManager {
|
|
|
20
20
|
const expiresAt = new Date(config.auth.expiresAt);
|
|
21
21
|
const now = new Date();
|
|
22
22
|
const timeUntilExpiry = expiresAt.getTime() - now.getTime();
|
|
23
|
-
|
|
23
|
+
const isExpiryInvalid = Number.isNaN(timeUntilExpiry);
|
|
24
|
+
if (isExpiryInvalid || timeUntilExpiry < this.refreshThresholdMs) {
|
|
24
25
|
logger.info('Token expiring soon, refreshing...', {
|
|
25
26
|
expiresAt: config.auth.expiresAt,
|
|
27
|
+
isExpiryInvalid,
|
|
26
28
|
});
|
|
27
29
|
await this.refresh();
|
|
28
30
|
return this.configManager.load().auth.accessToken;
|
|
@@ -40,20 +42,29 @@ export class TokenManager {
|
|
|
40
42
|
try {
|
|
41
43
|
const response = await fetch(`${config.baseUrl}/api/cli/auth/refresh`, {
|
|
42
44
|
method: 'POST',
|
|
43
|
-
headers: {
|
|
45
|
+
headers: {
|
|
46
|
+
'Content-Type': 'application/json',
|
|
47
|
+
Authorization: `Bearer ${config.auth.refreshToken}`,
|
|
48
|
+
},
|
|
44
49
|
body: JSON.stringify({ refreshToken: config.auth.refreshToken }),
|
|
45
50
|
});
|
|
46
51
|
if (!response.ok) {
|
|
47
52
|
throw new Error(`Refresh failed: ${response.status}`);
|
|
48
53
|
}
|
|
49
54
|
const data = (await response.json());
|
|
50
|
-
|
|
55
|
+
const nextAccessToken = data.accessToken || data.token;
|
|
56
|
+
if (!data.success || !nextAccessToken) {
|
|
51
57
|
throw new Error('Invalid refresh response');
|
|
52
58
|
}
|
|
59
|
+
// Calculate new expiration time
|
|
60
|
+
const expiresAt = data.expiresAt ? new Date(data.expiresAt) : new Date();
|
|
61
|
+
if (!data.expiresAt) {
|
|
62
|
+
expiresAt.setSeconds(expiresAt.getSeconds() + (data.expiresIn || 86400));
|
|
63
|
+
}
|
|
53
64
|
this.configManager.updateAuth({
|
|
54
|
-
accessToken:
|
|
55
|
-
refreshToken: data.
|
|
56
|
-
expiresAt:
|
|
65
|
+
accessToken: nextAccessToken,
|
|
66
|
+
refreshToken: data.refreshToken || config.auth.refreshToken,
|
|
67
|
+
expiresAt: expiresAt.toISOString(),
|
|
57
68
|
userId: config.auth.userId,
|
|
58
69
|
});
|
|
59
70
|
logger.info('Token refreshed successfully');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../../src/lib/auth/token-manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,MAAM,OAAO,YAAY;IAIvB,YAAY,aAA4B;QAFhC,uBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,uBAAuB;QAGlE,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa;QACjB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,mBAAmB,
|
|
1
|
+
{"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../../src/lib/auth/token-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/logger.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/logger.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,oBAAY,QAAQ;IAClB,KAAK,IAAI;IACT,IAAI,IAAI;IACR,IAAI,IAAI;IACR,KAAK,IAAI;CACV;AAED,cAAM,MAAM;IACV,OAAO,CAAC,KAAK,CAA2B;IAExC,QAAQ,CAAC,KAAK,EAAE,QAAQ;IAIxB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAOjC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAOhC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG;IAOhC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,GAAG;CAO3C;AAED,eAAO,MAAM,MAAM,QAAe,CAAC"}
|
package/dist/lib/utils/logger.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Simple structured logger for CodeVF
|
|
3
|
+
*
|
|
4
|
+
* CRITICAL: When running as an MCP server, all logs MUST go to stderr.
|
|
5
|
+
* stdout is reserved for JSON-RPC protocol messages only.
|
|
3
6
|
*/
|
|
4
7
|
export var LogLevel;
|
|
5
8
|
(function (LogLevel) {
|
|
@@ -17,22 +20,27 @@ class Logger {
|
|
|
17
20
|
}
|
|
18
21
|
debug(message, meta) {
|
|
19
22
|
if (this.level <= LogLevel.DEBUG) {
|
|
20
|
-
|
|
23
|
+
// Always write to stderr for MCP compatibility
|
|
24
|
+
process.stderr.write(`[DEBUG] ${message}${meta ? ' ' + JSON.stringify(meta) : ''}\n`);
|
|
21
25
|
}
|
|
22
26
|
}
|
|
23
27
|
info(message, meta) {
|
|
24
28
|
if (this.level <= LogLevel.INFO) {
|
|
25
|
-
|
|
29
|
+
// Always write to stderr for MCP compatibility
|
|
30
|
+
process.stderr.write(`[INFO] ${message}${meta ? ' ' + JSON.stringify(meta) : ''}\n`);
|
|
26
31
|
}
|
|
27
32
|
}
|
|
28
33
|
warn(message, meta) {
|
|
29
34
|
if (this.level <= LogLevel.WARN) {
|
|
30
|
-
|
|
35
|
+
// Always write to stderr for MCP compatibility
|
|
36
|
+
process.stderr.write(`[WARN] ${message}${meta ? ' ' + JSON.stringify(meta) : ''}\n`);
|
|
31
37
|
}
|
|
32
38
|
}
|
|
33
39
|
error(message, error) {
|
|
34
40
|
if (this.level <= LogLevel.ERROR) {
|
|
35
|
-
|
|
41
|
+
// Always write to stderr for MCP compatibility
|
|
42
|
+
const errorInfo = error instanceof Error ? error.stack : JSON.stringify(error);
|
|
43
|
+
process.stderr.write(`[ERROR] ${message}${errorInfo ? ' ' + errorInfo : ''}\n`);
|
|
36
44
|
}
|
|
37
45
|
}
|
|
38
46
|
}
|