@ai-support-agent/cli 0.0.5-beta.5 → 0.0.6
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-config-sync.d.ts +49 -0
- package/dist/agent-config-sync.d.ts.map +1 -0
- package/dist/agent-config-sync.js +168 -0
- package/dist/agent-config-sync.js.map +1 -0
- package/dist/agent-runner.d.ts +11 -3
- package/dist/agent-runner.d.ts.map +1 -1
- package/dist/agent-runner.js +48 -24
- package/dist/agent-runner.js.map +1 -1
- package/dist/agent-transport.d.ts +59 -0
- package/dist/agent-transport.d.ts.map +1 -0
- package/dist/agent-transport.js +225 -0
- package/dist/agent-transport.js.map +1 -0
- package/dist/api-client.d.ts +2 -1
- package/dist/api-client.d.ts.map +1 -1
- package/dist/api-client.js +4 -0
- package/dist/api-client.js.map +1 -1
- package/dist/appsync-subscriber.d.ts +15 -9
- package/dist/appsync-subscriber.d.ts.map +1 -1
- package/dist/appsync-subscriber.js +50 -111
- package/dist/appsync-subscriber.js.map +1 -1
- package/dist/aws-profile.d.ts.map +1 -1
- package/dist/aws-profile.js +3 -6
- package/dist/aws-profile.js.map +1 -1
- package/dist/base-websocket.d.ts +40 -0
- package/dist/base-websocket.d.ts.map +1 -0
- package/dist/base-websocket.js +95 -0
- package/dist/base-websocket.js.map +1 -0
- package/dist/child-process-manager.d.ts +20 -0
- package/dist/child-process-manager.d.ts.map +1 -0
- package/dist/child-process-manager.js +125 -0
- package/dist/child-process-manager.js.map +1 -0
- package/dist/commands/api-chat-executor.d.ts +10 -1
- package/dist/commands/api-chat-executor.d.ts.map +1 -1
- package/dist/commands/api-chat-executor.js +83 -58
- package/dist/commands/api-chat-executor.js.map +1 -1
- package/dist/commands/chat-executor.d.ts +13 -2
- package/dist/commands/chat-executor.d.ts.map +1 -1
- package/dist/commands/chat-executor.js +66 -16
- package/dist/commands/chat-executor.js.map +1 -1
- package/dist/commands/claude-code-args.d.ts +12 -0
- package/dist/commands/claude-code-args.d.ts.map +1 -0
- package/dist/commands/claude-code-args.js +78 -0
- package/dist/commands/claude-code-args.js.map +1 -0
- package/dist/commands/claude-code-runner.d.ts +17 -36
- package/dist/commands/claude-code-runner.d.ts.map +1 -1
- package/dist/commands/claude-code-runner.js +49 -221
- package/dist/commands/claude-code-runner.js.map +1 -1
- package/dist/commands/claude-code-stream.d.ts +63 -0
- package/dist/commands/claude-code-stream.d.ts.map +1 -0
- package/dist/commands/claude-code-stream.js +179 -0
- package/dist/commands/claude-code-stream.js.map +1 -0
- package/dist/commands/file-executor.d.ts +1 -1
- package/dist/commands/file-executor.d.ts.map +1 -1
- package/dist/commands/file-executor.js +59 -70
- package/dist/commands/file-executor.js.map +1 -1
- package/dist/commands/file-path-guard.d.ts +9 -0
- package/dist/commands/file-path-guard.d.ts.map +1 -0
- package/dist/commands/file-path-guard.js +15 -0
- package/dist/commands/file-path-guard.js.map +1 -0
- package/dist/commands/file-transfer.d.ts +5 -0
- package/dist/commands/file-transfer.d.ts.map +1 -1
- package/dist/commands/file-transfer.js +16 -39
- package/dist/commands/file-transfer.js.map +1 -1
- package/dist/commands/index.d.ts +1 -1
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +18 -7
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/process-executor.d.ts +1 -1
- package/dist/commands/process-executor.d.ts.map +1 -1
- package/dist/commands/process-executor.js +24 -6
- package/dist/commands/process-executor.js.map +1 -1
- package/dist/commands/process-manager.d.ts +22 -0
- package/dist/commands/process-manager.d.ts.map +1 -0
- package/dist/commands/process-manager.js +36 -0
- package/dist/commands/process-manager.js.map +1 -0
- package/dist/commands/shared-chat-utils.d.ts +10 -1
- package/dist/commands/shared-chat-utils.d.ts.map +1 -1
- package/dist/commands/shared-chat-utils.js +18 -0
- package/dist/commands/shared-chat-utils.js.map +1 -1
- package/dist/commands/shell-executor.d.ts +1 -1
- package/dist/commands/shell-executor.d.ts.map +1 -1
- package/dist/commands/shell-executor.js +9 -12
- package/dist/commands/shell-executor.js.map +1 -1
- package/dist/config-manager.d.ts.map +1 -1
- package/dist/config-manager.js +2 -3
- package/dist/config-manager.js.map +1 -1
- package/dist/constants.d.ts +21 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +26 -1
- package/dist/constants.js.map +1 -1
- package/dist/docker/docker-runner.d.ts.map +1 -1
- package/dist/docker/docker-runner.js +5 -3
- package/dist/docker/docker-runner.js.map +1 -1
- package/dist/ipc-types.d.ts +36 -0
- package/dist/ipc-types.d.ts.map +1 -0
- package/dist/ipc-types.js +34 -0
- package/dist/ipc-types.js.map +1 -0
- package/dist/mcp/config-writer.d.ts +5 -1
- package/dist/mcp/config-writer.d.ts.map +1 -1
- package/dist/mcp/config-writer.js +14 -1
- package/dist/mcp/config-writer.js.map +1 -1
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +2 -0
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/tools/credentials.d.ts.map +1 -1
- package/dist/mcp/tools/credentials.js +36 -9
- package/dist/mcp/tools/credentials.js.map +1 -1
- package/dist/mcp/tools/db-query.d.ts.map +1 -1
- package/dist/mcp/tools/db-query.js +13 -18
- package/dist/mcp/tools/db-query.js.map +1 -1
- package/dist/mcp/tools/db-schemas.d.ts.map +1 -1
- package/dist/mcp/tools/db-schemas.js +8 -13
- package/dist/mcp/tools/db-schemas.js.map +1 -1
- package/dist/mcp/tools/file-upload.d.ts.map +1 -1
- package/dist/mcp/tools/file-upload.js +12 -17
- package/dist/mcp/tools/file-upload.js.map +1 -1
- package/dist/mcp/tools/mcp-response.d.ts +29 -1
- package/dist/mcp/tools/mcp-response.d.ts.map +1 -1
- package/dist/mcp/tools/mcp-response.js +51 -3
- package/dist/mcp/tools/mcp-response.js.map +1 -1
- package/dist/mcp/tools/project-info.d.ts.map +1 -1
- package/dist/mcp/tools/project-info.js +28 -33
- package/dist/mcp/tools/project-info.js.map +1 -1
- package/dist/mcp/tools/read-conversation-file.d.ts +4 -0
- package/dist/mcp/tools/read-conversation-file.d.ts.map +1 -0
- package/dist/mcp/tools/read-conversation-file.js +92 -0
- package/dist/mcp/tools/read-conversation-file.js.map +1 -0
- package/dist/process-manager.d.ts +2 -0
- package/dist/process-manager.d.ts.map +1 -0
- package/dist/process-manager.js +7 -0
- package/dist/process-manager.js.map +1 -0
- package/dist/project-agent.d.ts +5 -25
- package/dist/project-agent.d.ts.map +1 -1
- package/dist/project-agent.js +67 -313
- package/dist/project-agent.js.map +1 -1
- package/dist/project-config-sync.d.ts.map +1 -1
- package/dist/project-config-sync.js +9 -3
- package/dist/project-config-sync.js.map +1 -1
- package/dist/project-worker.d.ts +2 -0
- package/dist/project-worker.d.ts.map +1 -0
- package/dist/project-worker.js +85 -0
- package/dist/project-worker.js.map +1 -0
- package/dist/repo-sync.d.ts +23 -0
- package/dist/repo-sync.d.ts.map +1 -0
- package/dist/repo-sync.js +191 -0
- package/dist/repo-sync.js.map +1 -0
- package/dist/terminal/terminal-websocket.d.ts +8 -9
- package/dist/terminal/terminal-websocket.d.ts.map +1 -1
- package/dist/terminal/terminal-websocket.js +30 -87
- package/dist/terminal/terminal-websocket.js.map +1 -1
- package/dist/types/chat.d.ts +28 -0
- package/dist/types/chat.d.ts.map +1 -0
- package/dist/types/chat.js +3 -0
- package/dist/types/chat.js.map +1 -0
- package/dist/types/command.d.ts +100 -0
- package/dist/types/command.d.ts.map +1 -0
- package/dist/types/command.js +11 -0
- package/dist/types/command.js.map +1 -0
- package/dist/types/config.d.ts +44 -0
- package/dist/types/config.d.ts.map +1 -0
- package/dist/types/config.js +3 -0
- package/dist/types/config.js.map +1 -0
- package/dist/types/index.d.ts +6 -0
- package/dist/types/index.d.ts.map +1 -0
- package/dist/types/index.js +22 -0
- package/dist/types/index.js.map +1 -0
- package/dist/types/project.d.ts +112 -0
- package/dist/types/project.d.ts.map +1 -0
- package/dist/types/project.js +3 -0
- package/dist/types/project.js.map +1 -0
- package/dist/types/server.d.ts +58 -0
- package/dist/types/server.d.ts.map +1 -0
- package/dist/types/server.js +3 -0
- package/dist/types/server.js.map +1 -0
- package/dist/types.d.ts +1 -295
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +15 -0
- package/dist/types.js.map +1 -1
- package/dist/utils/activity-timeout.d.ts +19 -0
- package/dist/utils/activity-timeout.d.ts.map +1 -0
- package/dist/utils/activity-timeout.js +28 -0
- package/dist/utils/activity-timeout.js.map +1 -0
- package/dist/utils/claude-config-validator.d.ts +16 -0
- package/dist/utils/claude-config-validator.d.ts.map +1 -0
- package/dist/utils/claude-config-validator.js +94 -0
- package/dist/utils/claude-config-validator.js.map +1 -0
- package/dist/utils/content-type.d.ts +10 -0
- package/dist/utils/content-type.d.ts.map +1 -0
- package/dist/utils/content-type.js +120 -0
- package/dist/utils/content-type.js.map +1 -0
- package/dist/utils/json-parse.d.ts +5 -0
- package/dist/utils/json-parse.d.ts.map +1 -0
- package/dist/utils/json-parse.js +15 -0
- package/dist/utils/json-parse.js.map +1 -0
- package/dist/utils/stream-parser.d.ts +14 -0
- package/dist/utils/stream-parser.d.ts.map +1 -0
- package/dist/utils/stream-parser.js +31 -0
- package/dist/utils/stream-parser.js.map +1 -0
- package/dist/utils.d.ts +1 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +40 -0
- package/dist/utils.js.map +1 -1
- package/dist/ws-reconnect.d.ts +12 -0
- package/dist/ws-reconnect.d.ts.map +1 -0
- package/dist/ws-reconnect.js +32 -0
- package/dist/ws-reconnect.js.map +1 -0
- package/package.json +2 -2
package/dist/aws-profile.js
CHANGED
|
@@ -43,6 +43,7 @@ const fs = __importStar(require("fs"));
|
|
|
43
43
|
const path = __importStar(require("path"));
|
|
44
44
|
const project_dir_1 = require("./project-dir");
|
|
45
45
|
const logger_1 = require("./logger");
|
|
46
|
+
const utils_1 = require("./utils");
|
|
46
47
|
/**
|
|
47
48
|
* Generate profile name from project code and account.
|
|
48
49
|
* Uses profileName if available, otherwise falls back to name.
|
|
@@ -88,9 +89,7 @@ function writeAwsConfig(projectDir, projectCode, accounts) {
|
|
|
88
89
|
}
|
|
89
90
|
const content = generateAwsConfig(projectCode, accounts);
|
|
90
91
|
const configPath = path.join(awsDir, 'config');
|
|
91
|
-
|
|
92
|
-
fs.writeFileSync(tmpPath, content, { mode: 0o600 });
|
|
93
|
-
fs.renameSync(tmpPath, configPath);
|
|
92
|
+
(0, utils_1.atomicWriteFile)(configPath, content);
|
|
94
93
|
logger_1.logger.debug(`AWS config written to ${configPath} (${accounts.length} profiles)`);
|
|
95
94
|
}
|
|
96
95
|
catch (error) {
|
|
@@ -131,9 +130,7 @@ function writeAwsCredentials(projectDir, projectCode, credentialMap) {
|
|
|
131
130
|
}
|
|
132
131
|
const content = generateAwsCredentials(projectCode, credentialMap);
|
|
133
132
|
const credentialsPath = path.join(awsDir, 'credentials');
|
|
134
|
-
|
|
135
|
-
fs.writeFileSync(tmpPath, content, { mode: 0o600 });
|
|
136
|
-
fs.renameSync(tmpPath, credentialsPath);
|
|
133
|
+
(0, utils_1.atomicWriteFile)(credentialsPath, content);
|
|
137
134
|
logger_1.logger.debug(`AWS credentials written to ${credentialsPath} (${credentialMap.size} profiles)`);
|
|
138
135
|
}
|
|
139
136
|
catch (error) {
|
package/dist/aws-profile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-profile.js","sourceRoot":"","sources":["../src/aws-profile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"aws-profile.js","sourceRoot":"","sources":["../src/aws-profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import WebSocket from 'ws';
|
|
2
|
+
export interface BaseWebSocketOptions {
|
|
3
|
+
maxReconnectRetries: number;
|
|
4
|
+
reconnectBaseDelayMs: number;
|
|
5
|
+
logPrefix: string;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* WebSocket 接続の共通ライフサイクル管理
|
|
9
|
+
* - 接続 / 再接続 / 切断
|
|
10
|
+
* - JSON メッセージパース
|
|
11
|
+
* - 再接続時のコールバック
|
|
12
|
+
*/
|
|
13
|
+
export declare abstract class BaseWebSocketConnection<TMessage> {
|
|
14
|
+
protected ws: WebSocket | null;
|
|
15
|
+
protected closed: boolean;
|
|
16
|
+
protected readonly reconnectAttemptsRef: {
|
|
17
|
+
current: number;
|
|
18
|
+
};
|
|
19
|
+
private readonly options;
|
|
20
|
+
constructor(options: BaseWebSocketOptions);
|
|
21
|
+
connect(): Promise<void>;
|
|
22
|
+
disconnect(): void;
|
|
23
|
+
/** WebSocket URL とオプションを返す */
|
|
24
|
+
protected abstract createWebSocket(): WebSocket;
|
|
25
|
+
/** 接続成功時の処理。Promise を resolve するタイミングはサブクラスが決める */
|
|
26
|
+
protected abstract onOpen(ws: WebSocket, resolve: (value: void) => void): void;
|
|
27
|
+
/** パースされたメッセージを処理する */
|
|
28
|
+
protected abstract onParsedMessage(msg: TMessage, resolve?: (value: void) => void): void;
|
|
29
|
+
/** 切断時のクリーンアップ(サブクラスでオーバーライド) */
|
|
30
|
+
protected onDisconnect(): void;
|
|
31
|
+
/** WebSocket を閉じる(サブクラスでオーバーライド可能) */
|
|
32
|
+
protected closeWebSocket(ws: WebSocket): void;
|
|
33
|
+
/** 再接続成功時のコールバック(サブクラスでオーバーライド可能) */
|
|
34
|
+
protected onReconnected(): void;
|
|
35
|
+
protected doConnect(): Promise<void>;
|
|
36
|
+
/** WebSocket close イベント時の追加処理(サブクラスでオーバーライド可能) */
|
|
37
|
+
protected onWebSocketClose(): void;
|
|
38
|
+
private doReconnect;
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=base-websocket.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base-websocket.d.ts","sourceRoot":"","sources":["../src/base-websocket.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAA;AAM1B,MAAM,WAAW,oBAAoB;IACnC,mBAAmB,EAAE,MAAM,CAAA;IAC3B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;;;;GAKG;AACH,8BAAsB,uBAAuB,CAAC,QAAQ;IACpD,SAAS,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAAO;IACrC,SAAS,CAAC,MAAM,UAAQ;IACxB,SAAS,CAAC,QAAQ,CAAC,oBAAoB;;MAAiB;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;gBAElC,OAAO,EAAE,oBAAoB;IAIzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,UAAU,IAAI,IAAI;IASlB,8BAA8B;IAC9B,SAAS,CAAC,QAAQ,CAAC,eAAe,IAAI,SAAS;IAE/C,mDAAmD;IACnD,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,GAAG,IAAI;IAE9E,uBAAuB;IACvB,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,GAAG,IAAI;IAExF,iCAAiC;IACjC,SAAS,CAAC,YAAY,IAAI,IAAI;IAI9B,sCAAsC;IACtC,SAAS,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAI7C,qCAAqC;IACrC,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B,SAAS,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsCpC,kDAAkD;IAClD,SAAS,CAAC,gBAAgB,IAAI,IAAI;YAIpB,WAAW;CAU1B"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BaseWebSocketConnection = void 0;
|
|
4
|
+
const logger_1 = require("./logger");
|
|
5
|
+
const utils_1 = require("./utils");
|
|
6
|
+
const ws_reconnect_1 = require("./ws-reconnect");
|
|
7
|
+
/**
|
|
8
|
+
* WebSocket 接続の共通ライフサイクル管理
|
|
9
|
+
* - 接続 / 再接続 / 切断
|
|
10
|
+
* - JSON メッセージパース
|
|
11
|
+
* - 再接続時のコールバック
|
|
12
|
+
*/
|
|
13
|
+
class BaseWebSocketConnection {
|
|
14
|
+
ws = null;
|
|
15
|
+
closed = false;
|
|
16
|
+
reconnectAttemptsRef = { current: 0 };
|
|
17
|
+
options;
|
|
18
|
+
constructor(options) {
|
|
19
|
+
this.options = options;
|
|
20
|
+
}
|
|
21
|
+
connect() {
|
|
22
|
+
this.closed = false;
|
|
23
|
+
this.reconnectAttemptsRef.current = 0;
|
|
24
|
+
return this.doConnect();
|
|
25
|
+
}
|
|
26
|
+
disconnect() {
|
|
27
|
+
this.closed = true;
|
|
28
|
+
this.onDisconnect();
|
|
29
|
+
if (this.ws) {
|
|
30
|
+
this.closeWebSocket(this.ws);
|
|
31
|
+
this.ws = null;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/** 切断時のクリーンアップ(サブクラスでオーバーライド) */
|
|
35
|
+
onDisconnect() {
|
|
36
|
+
// default: no-op
|
|
37
|
+
}
|
|
38
|
+
/** WebSocket を閉じる(サブクラスでオーバーライド可能) */
|
|
39
|
+
closeWebSocket(ws) {
|
|
40
|
+
ws.close();
|
|
41
|
+
}
|
|
42
|
+
/** 再接続成功時のコールバック(サブクラスでオーバーライド可能) */
|
|
43
|
+
onReconnected() {
|
|
44
|
+
// default: no-op
|
|
45
|
+
}
|
|
46
|
+
doConnect() {
|
|
47
|
+
return new Promise((resolve, reject) => {
|
|
48
|
+
const ws = this.createWebSocket();
|
|
49
|
+
ws.on('open', () => {
|
|
50
|
+
this.onOpen(ws, resolve);
|
|
51
|
+
});
|
|
52
|
+
ws.on('message', (data) => {
|
|
53
|
+
let msg;
|
|
54
|
+
try {
|
|
55
|
+
msg = JSON.parse(data.toString());
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
logger_1.logger.debug(`${this.options.logPrefix} Failed to parse message`);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
this.onParsedMessage(msg, resolve);
|
|
62
|
+
});
|
|
63
|
+
ws.on('error', (error) => {
|
|
64
|
+
logger_1.logger.debug(`${this.options.logPrefix} WebSocket error: ${(0, utils_1.getErrorMessage)(error)}`);
|
|
65
|
+
if (this.reconnectAttemptsRef.current === 0 && !this.ws) {
|
|
66
|
+
reject(error);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
ws.on('close', () => {
|
|
70
|
+
this.onWebSocketClose();
|
|
71
|
+
if (!this.closed) {
|
|
72
|
+
logger_1.logger.debug(`${this.options.logPrefix} Connection closed unexpectedly`);
|
|
73
|
+
void this.doReconnect();
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
this.ws = ws;
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
/** WebSocket close イベント時の追加処理(サブクラスでオーバーライド可能) */
|
|
80
|
+
onWebSocketClose() {
|
|
81
|
+
// default: no-op
|
|
82
|
+
}
|
|
83
|
+
async doReconnect() {
|
|
84
|
+
await (0, ws_reconnect_1.attemptReconnect)(this.reconnectAttemptsRef, {
|
|
85
|
+
maxRetries: this.options.maxReconnectRetries,
|
|
86
|
+
baseDelayMs: this.options.reconnectBaseDelayMs,
|
|
87
|
+
logPrefix: this.options.logPrefix,
|
|
88
|
+
connectFn: () => this.doConnect(),
|
|
89
|
+
onReconnectedFn: () => this.onReconnected(),
|
|
90
|
+
isClosedFn: () => this.closed,
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
exports.BaseWebSocketConnection = BaseWebSocketConnection;
|
|
95
|
+
//# sourceMappingURL=base-websocket.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base-websocket.js","sourceRoot":"","sources":["../src/base-websocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { AgentChatMode, ProjectRegistration } from './types';
|
|
2
|
+
export declare class ChildProcessManager {
|
|
3
|
+
private readonly processes;
|
|
4
|
+
private readonly restartTimers;
|
|
5
|
+
private stopping;
|
|
6
|
+
forkProject(project: ProjectRegistration, agentId: string, options: {
|
|
7
|
+
pollInterval: number;
|
|
8
|
+
heartbeatInterval: number;
|
|
9
|
+
agentChatMode?: AgentChatMode;
|
|
10
|
+
defaultProjectDir?: string;
|
|
11
|
+
}): void;
|
|
12
|
+
private spawnChild;
|
|
13
|
+
private resetRestartCount;
|
|
14
|
+
private handleChildMessage;
|
|
15
|
+
private handleChildExit;
|
|
16
|
+
sendUpdateToAll(): void;
|
|
17
|
+
stopAll(timeoutMs?: number): Promise<void>;
|
|
18
|
+
getRunningCount(): number;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=child-process-manager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"child-process-manager.d.ts","sourceRoot":"","sources":["../src/child-process-manager.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AASjE,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoC;IAC9D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmD;IACjF,OAAO,CAAC,QAAQ,CAAQ;IAExB,WAAW,CACT,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,YAAY,EAAE,MAAM,CAAA;QACpB,iBAAiB,EAAE,MAAM,CAAA;QACzB,aAAa,CAAC,EAAE,aAAa,CAAA;QAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;KAC3B,GACA,IAAI;IAWP,OAAO,CAAC,UAAU;IAgClB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,eAAe;IAyBvB,eAAe,IAAI,IAAI;IASjB,OAAO,CAAC,SAAS,GAAE,MAAsC,GAAG,OAAO,CAAC,IAAI,CAAC;IAkC/E,eAAe,IAAI,MAAM;CAG1B"}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ChildProcessManager = void 0;
|
|
4
|
+
const child_process_1 = require("child_process");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const constants_1 = require("./constants");
|
|
7
|
+
const ipc_types_1 = require("./ipc-types");
|
|
8
|
+
const logger_1 = require("./logger");
|
|
9
|
+
class ChildProcessManager {
|
|
10
|
+
processes = new Map();
|
|
11
|
+
restartTimers = new Map();
|
|
12
|
+
stopping = false;
|
|
13
|
+
forkProject(project, agentId, options) {
|
|
14
|
+
const startMessage = {
|
|
15
|
+
type: 'start',
|
|
16
|
+
project,
|
|
17
|
+
agentId,
|
|
18
|
+
options,
|
|
19
|
+
};
|
|
20
|
+
this.spawnChild(project.projectCode, startMessage);
|
|
21
|
+
}
|
|
22
|
+
spawnChild(projectCode, startMessage) {
|
|
23
|
+
const workerPath = (0, path_1.join)(__dirname, 'project-worker.js');
|
|
24
|
+
const child = (0, child_process_1.fork)(workerPath, [], {
|
|
25
|
+
stdio: ['pipe', 'inherit', 'inherit', 'ipc'],
|
|
26
|
+
});
|
|
27
|
+
const managed = {
|
|
28
|
+
child,
|
|
29
|
+
project: startMessage.project,
|
|
30
|
+
restartCount: this.processes.get(projectCode)?.restartCount ?? 0,
|
|
31
|
+
startMessage,
|
|
32
|
+
};
|
|
33
|
+
this.processes.set(projectCode, managed);
|
|
34
|
+
child.on('message', (msg) => {
|
|
35
|
+
if (!(0, ipc_types_1.isChildToParentMessage)(msg))
|
|
36
|
+
return;
|
|
37
|
+
this.handleChildMessage(msg);
|
|
38
|
+
});
|
|
39
|
+
child.on('exit', (code, signal) => {
|
|
40
|
+
if (this.stopping)
|
|
41
|
+
return;
|
|
42
|
+
logger_1.logger.warn(`Child process for ${projectCode} exited (code=${code}, signal=${signal})`);
|
|
43
|
+
this.handleChildExit(projectCode);
|
|
44
|
+
});
|
|
45
|
+
child.send(startMessage);
|
|
46
|
+
logger_1.logger.info(`Forked child process for ${projectCode} (pid=${child.pid})`);
|
|
47
|
+
}
|
|
48
|
+
resetRestartCount(projectCode) {
|
|
49
|
+
const managed = this.processes.get(projectCode);
|
|
50
|
+
if (managed)
|
|
51
|
+
managed.restartCount = 0;
|
|
52
|
+
}
|
|
53
|
+
handleChildMessage(msg) {
|
|
54
|
+
switch (msg.type) {
|
|
55
|
+
case 'started':
|
|
56
|
+
logger_1.logger.info(`Project ${msg.projectCode} started in child process`);
|
|
57
|
+
this.resetRestartCount(msg.projectCode);
|
|
58
|
+
break;
|
|
59
|
+
case 'error':
|
|
60
|
+
logger_1.logger.error(`Project ${msg.projectCode} error: ${msg.message}`);
|
|
61
|
+
break;
|
|
62
|
+
case 'stopped':
|
|
63
|
+
logger_1.logger.info(`Project ${msg.projectCode} stopped`);
|
|
64
|
+
break;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
handleChildExit(projectCode) {
|
|
68
|
+
const managed = this.processes.get(projectCode);
|
|
69
|
+
if (!managed)
|
|
70
|
+
return;
|
|
71
|
+
if (managed.restartCount >= constants_1.CHILD_PROCESS_MAX_RESTARTS) {
|
|
72
|
+
logger_1.logger.error(`Project ${projectCode} exceeded max restarts (${constants_1.CHILD_PROCESS_MAX_RESTARTS}). Not restarting.`);
|
|
73
|
+
this.processes.delete(projectCode);
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
managed.restartCount++;
|
|
77
|
+
logger_1.logger.info(`Restarting ${projectCode} in ${constants_1.CHILD_PROCESS_RESTART_DELAY_MS}ms (attempt ${managed.restartCount}/${constants_1.CHILD_PROCESS_MAX_RESTARTS})`);
|
|
78
|
+
const timer = setTimeout(() => {
|
|
79
|
+
this.restartTimers.delete(projectCode);
|
|
80
|
+
if (this.stopping)
|
|
81
|
+
return;
|
|
82
|
+
this.spawnChild(projectCode, managed.startMessage);
|
|
83
|
+
}, constants_1.CHILD_PROCESS_RESTART_DELAY_MS);
|
|
84
|
+
this.restartTimers.set(projectCode, timer);
|
|
85
|
+
}
|
|
86
|
+
sendUpdateToAll() {
|
|
87
|
+
for (const [projectCode, managed] of this.processes) {
|
|
88
|
+
if (managed.child.connected) {
|
|
89
|
+
managed.child.send({ type: 'update' });
|
|
90
|
+
logger_1.logger.debug(`Sent update to ${projectCode}`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
async stopAll(timeoutMs = constants_1.CHILD_PROCESS_STOP_TIMEOUT_MS) {
|
|
95
|
+
this.stopping = true;
|
|
96
|
+
for (const timer of this.restartTimers.values())
|
|
97
|
+
clearTimeout(timer);
|
|
98
|
+
this.restartTimers.clear();
|
|
99
|
+
const shutdownPromises = [];
|
|
100
|
+
for (const [projectCode, managed] of this.processes) {
|
|
101
|
+
if (managed.child.connected) {
|
|
102
|
+
managed.child.send({ type: 'shutdown' });
|
|
103
|
+
logger_1.logger.debug(`Sent shutdown to ${projectCode}`);
|
|
104
|
+
}
|
|
105
|
+
shutdownPromises.push(new Promise((resolve) => {
|
|
106
|
+
const timer = setTimeout(() => {
|
|
107
|
+
logger_1.logger.warn(`Force killing ${projectCode} (timeout)`);
|
|
108
|
+
managed.child.kill('SIGKILL');
|
|
109
|
+
resolve();
|
|
110
|
+
}, timeoutMs);
|
|
111
|
+
managed.child.once('exit', () => {
|
|
112
|
+
clearTimeout(timer);
|
|
113
|
+
resolve();
|
|
114
|
+
});
|
|
115
|
+
}));
|
|
116
|
+
}
|
|
117
|
+
await Promise.all(shutdownPromises);
|
|
118
|
+
this.processes.clear();
|
|
119
|
+
}
|
|
120
|
+
getRunningCount() {
|
|
121
|
+
return this.processes.size;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
exports.ChildProcessManager = ChildProcessManager;
|
|
125
|
+
//# sourceMappingURL=child-process-manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"child-process-manager.js","sourceRoot":"","sources":["../src/child-process-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import { ApiClient } from '../api-client';
|
|
2
|
-
import type
|
|
2
|
+
import { type AgentServerConfig, type ChatPayload, type CommandResult } from '../types';
|
|
3
|
+
/**
|
|
4
|
+
* 実行中の API チャットプロセスをキャンセルする
|
|
5
|
+
* @returns true: プロセスが見つかりキャンセルした, false: プロセスが見つからなかった
|
|
6
|
+
*/
|
|
7
|
+
export declare function cancelApiChatProcess(commandId: string): boolean;
|
|
8
|
+
/** テスト用: runningApiChats の内容を取得 */
|
|
9
|
+
export declare function _getRunningApiChats(): Map<string, {
|
|
10
|
+
cancel: () => void;
|
|
11
|
+
}>;
|
|
3
12
|
/**
|
|
4
13
|
* Anthropic API を直接呼び出してチャットメッセージを処理する
|
|
5
14
|
* エージェントが持つ ANTHROPIC_API_KEY で Claude を呼び出す
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/api-chat-executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/api-chat-executor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAiBzC,OAAO,EAAE,KAAK,iBAAiB,EAAsB,KAAK,WAAW,EAAE,KAAK,aAAa,EAAmD,MAAM,UAAU,CAAA;AAY5J;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,mCAAmC;AACnC,wBAAgB,mBAAmB,IAAI,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAEzE;AAyCD;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,EACjB,MAAM,CAAC,EAAE,iBAAiB,EAC1B,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,CAgExB"}
|
|
@@ -3,30 +3,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.cancelApiChatProcess = cancelApiChatProcess;
|
|
7
|
+
exports._getRunningApiChats = _getRunningApiChats;
|
|
6
8
|
exports.executeApiChatCommand = executeApiChatCommand;
|
|
7
9
|
const axios_1 = __importDefault(require("axios"));
|
|
8
10
|
const constants_1 = require("../constants");
|
|
9
11
|
const logger_1 = require("../logger");
|
|
12
|
+
const types_1 = require("../types");
|
|
10
13
|
const utils_1 = require("../utils");
|
|
14
|
+
const activity_timeout_1 = require("../utils/activity-timeout");
|
|
15
|
+
const json_parse_1 = require("../utils/json-parse");
|
|
16
|
+
const stream_parser_1 = require("../utils/stream-parser");
|
|
17
|
+
const process_manager_1 = require("./process-manager");
|
|
11
18
|
const shared_chat_utils_1 = require("./shared-chat-utils");
|
|
19
|
+
/** 実行中の API チャットを commandId で管理 */
|
|
20
|
+
const processManager = new process_manager_1.ProcessManager();
|
|
21
|
+
/**
|
|
22
|
+
* 実行中の API チャットプロセスをキャンセルする
|
|
23
|
+
* @returns true: プロセスが見つかりキャンセルした, false: プロセスが見つからなかった
|
|
24
|
+
*/
|
|
25
|
+
function cancelApiChatProcess(commandId) {
|
|
26
|
+
return processManager.cancel(commandId);
|
|
27
|
+
}
|
|
28
|
+
/** テスト用: runningApiChats の内容を取得 */
|
|
29
|
+
function _getRunningApiChats() {
|
|
30
|
+
return processManager._getRunning();
|
|
31
|
+
}
|
|
12
32
|
/**
|
|
13
33
|
* Anthropic API を直接呼び出してチャットメッセージを処理する
|
|
14
34
|
* エージェントが持つ ANTHROPIC_API_KEY で Claude を呼び出す
|
|
15
35
|
*/
|
|
16
36
|
async function executeApiChatCommand(payload, commandId, client, config, agentId) {
|
|
17
37
|
if (!agentId) {
|
|
18
|
-
return
|
|
38
|
+
return (0, types_1.errorResult)(constants_1.ERR_AGENT_ID_REQUIRED);
|
|
19
39
|
}
|
|
20
40
|
const message = (0, utils_1.parseString)(payload.message);
|
|
21
41
|
if (!message) {
|
|
22
|
-
return
|
|
42
|
+
return (0, types_1.errorResult)(constants_1.ERR_MESSAGE_REQUIRED);
|
|
23
43
|
}
|
|
24
44
|
const apiKey = process.env.ANTHROPIC_API_KEY;
|
|
25
45
|
if (!apiKey) {
|
|
26
|
-
return
|
|
27
|
-
success: false,
|
|
28
|
-
error: constants_1.ERR_ANTHROPIC_API_KEY_NOT_SET,
|
|
29
|
-
};
|
|
46
|
+
return (0, types_1.errorResult)(constants_1.ERR_ANTHROPIC_API_KEY_NOT_SET);
|
|
30
47
|
}
|
|
31
48
|
logger_1.logger.info(`[api-chat] Starting API chat command [${commandId}]: message="${(0, utils_1.truncateString)(message, constants_1.LOG_MESSAGE_LIMIT)}"`);
|
|
32
49
|
const { sendChunk, getChunkIndex } = (0, shared_chat_utils_1.createChunkSender)(commandId, client, agentId, 'api-chat');
|
|
@@ -35,10 +52,18 @@ async function executeApiChatCommand(payload, commandId, client, config, agentId
|
|
|
35
52
|
const maxTokens = config?.claudeCodeConfig?.maxTokens ?? constants_1.DEFAULT_MAX_TOKENS;
|
|
36
53
|
const systemPrompt = config?.claudeCodeConfig?.systemPrompt;
|
|
37
54
|
const historyMessages = (0, shared_chat_utils_1.parseHistory)(payload.history);
|
|
38
|
-
const
|
|
55
|
+
const abortController = new AbortController();
|
|
56
|
+
processManager.register(commandId, { cancel: () => abortController.abort() });
|
|
57
|
+
let result;
|
|
58
|
+
try {
|
|
59
|
+
result = await callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt, sendChunk, historyMessages, abortController.signal);
|
|
60
|
+
}
|
|
61
|
+
finally {
|
|
62
|
+
processManager.remove(commandId);
|
|
63
|
+
}
|
|
39
64
|
logger_1.logger.info(`[api-chat] API chat command completed [${commandId}]: output=${result.text.length} chars, ${getChunkIndex()} chunks sent, tokens: in=${result.usage.inputTokens} out=${result.usage.outputTokens}`);
|
|
40
65
|
// done チャンクに usage 情報を含める
|
|
41
|
-
|
|
66
|
+
await (0, shared_chat_utils_1.sendDoneChunk)(sendChunk, {
|
|
42
67
|
text: result.text,
|
|
43
68
|
usage: {
|
|
44
69
|
totalInputTokens: result.usage.inputTokens,
|
|
@@ -46,20 +71,16 @@ async function executeApiChatCommand(payload, commandId, client, config, agentId
|
|
|
46
71
|
totalTokens: result.usage.inputTokens + result.usage.outputTokens,
|
|
47
72
|
},
|
|
48
73
|
});
|
|
49
|
-
|
|
50
|
-
return { success: true, data: result.text };
|
|
74
|
+
return (0, types_1.successResult)(result.text);
|
|
51
75
|
}
|
|
52
76
|
catch (error) {
|
|
53
|
-
|
|
54
|
-
logger_1.logger.error(`[api-chat] API chat command failed [${commandId}]: ${errorMessage}`);
|
|
55
|
-
await sendChunk('error', errorMessage);
|
|
56
|
-
return { success: false, error: errorMessage };
|
|
77
|
+
return (0, shared_chat_utils_1.handleChatError)(error, commandId, 'api-chat', sendChunk);
|
|
57
78
|
}
|
|
58
79
|
}
|
|
59
80
|
/**
|
|
60
81
|
* Anthropic Messages API を呼び出し、ストリーミングレスポンスを処理する
|
|
61
82
|
*/
|
|
62
|
-
async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt, sendChunk, history) {
|
|
83
|
+
async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt, sendChunk, history, abortSignal) {
|
|
63
84
|
const messages = [
|
|
64
85
|
...(history ?? []).map((msg) => ({
|
|
65
86
|
role: msg.role === 'assistant' ? 'assistant' : 'user',
|
|
@@ -84,65 +105,69 @@ async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt,
|
|
|
84
105
|
},
|
|
85
106
|
responseType: 'stream',
|
|
86
107
|
timeout: constants_1.CHAT_TIMEOUT,
|
|
108
|
+
...(abortSignal ? { signal: abortSignal } : {}),
|
|
87
109
|
});
|
|
88
110
|
return new Promise((resolve, reject) => {
|
|
89
111
|
let fullOutput = '';
|
|
90
|
-
let buffer = '';
|
|
91
112
|
const usage = { inputTokens: 0, outputTokens: 0 };
|
|
92
113
|
const stream = response.data;
|
|
114
|
+
const lineParser = new stream_parser_1.StreamLineParser();
|
|
115
|
+
// アクティビティベースタイムアウト: ストリームデータ受信が途絶えたら中止
|
|
116
|
+
const activityTimeout = (0, activity_timeout_1.createActivityTimeout)(constants_1.CHAT_TIMEOUT, () => {
|
|
117
|
+
logger_1.logger.warn(`[api-chat] Stream timed out after ${constants_1.CHAT_TIMEOUT / 1000}s of inactivity`);
|
|
118
|
+
stream.destroy(new Error(`Stream timed out after ${constants_1.CHAT_TIMEOUT / 1000}s of inactivity`));
|
|
119
|
+
});
|
|
93
120
|
stream.on('data', (chunk) => {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
//
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
if (!line.startsWith(
|
|
100
|
-
|
|
101
|
-
const data = line.slice(
|
|
102
|
-
if (data ===
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
121
|
+
activityTimeout.reset();
|
|
122
|
+
// SSE lines use \n as line separator; StreamLineParser handles buffering
|
|
123
|
+
// but SSE format needs special handling: lines start with "data: "
|
|
124
|
+
// We parse manually since SSE lines may contain empty lines as delimiters
|
|
125
|
+
lineParser.push(chunk.toString(), (line) => {
|
|
126
|
+
if (!line.startsWith(constants_1.SSE_PREFIX))
|
|
127
|
+
return;
|
|
128
|
+
const data = line.slice(constants_1.SSE_PREFIX.length).trim();
|
|
129
|
+
if (data === constants_1.SSE_DONE)
|
|
130
|
+
return;
|
|
131
|
+
const event = (0, json_parse_1.safeJsonParse)(data);
|
|
132
|
+
if (!event)
|
|
133
|
+
return;
|
|
134
|
+
if (event.type === constants_1.SSE_EVENT.MESSAGE_START) {
|
|
135
|
+
// message_start イベントから input_tokens を取得
|
|
136
|
+
const inputTokens = event.message?.usage?.input_tokens;
|
|
137
|
+
if (typeof inputTokens === 'number') {
|
|
138
|
+
usage.inputTokens = inputTokens;
|
|
113
139
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
}
|
|
121
|
-
else if (event.type === 'content_block_delta') {
|
|
122
|
-
const delta = event.delta;
|
|
123
|
-
if (delta?.type === 'text_delta' && typeof delta.text === 'string') {
|
|
124
|
-
fullOutput += delta.text;
|
|
125
|
-
void sendChunk('delta', delta.text);
|
|
126
|
-
}
|
|
140
|
+
}
|
|
141
|
+
else if (event.type === constants_1.SSE_EVENT.MESSAGE_DELTA) {
|
|
142
|
+
// message_delta イベントから output_tokens を取得
|
|
143
|
+
const outputTokens = event.usage?.output_tokens;
|
|
144
|
+
if (typeof outputTokens === 'number') {
|
|
145
|
+
usage.outputTokens = outputTokens;
|
|
127
146
|
}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
}
|
|
147
|
+
}
|
|
148
|
+
else if (event.type === constants_1.SSE_EVENT.CONTENT_BLOCK_DELTA) {
|
|
149
|
+
const delta = event.delta;
|
|
150
|
+
if (delta?.type === constants_1.ANTHROPIC_CONTENT_TYPE.TEXT_DELTA && typeof delta.text === 'string') {
|
|
151
|
+
fullOutput += delta.text;
|
|
152
|
+
void sendChunk('delta', delta.text);
|
|
135
153
|
}
|
|
136
154
|
}
|
|
137
|
-
|
|
138
|
-
|
|
155
|
+
else if (event.type === constants_1.SSE_EVENT.CONTENT_BLOCK_START) {
|
|
156
|
+
const contentBlock = event.content_block;
|
|
157
|
+
if (contentBlock?.type === constants_1.ANTHROPIC_CONTENT_TYPE.TOOL_USE) {
|
|
158
|
+
const toolName = contentBlock.name ?? 'unknown';
|
|
159
|
+
logger_1.logger.info(`[api-chat] Tool use requested: ${toolName} (not supported in API mode)`);
|
|
160
|
+
void sendChunk('delta', `\n[Tool call: ${toolName} — tool use is not supported in API chat mode]\n`);
|
|
161
|
+
}
|
|
139
162
|
}
|
|
140
|
-
}
|
|
163
|
+
});
|
|
141
164
|
});
|
|
142
165
|
stream.on('end', () => {
|
|
166
|
+
activityTimeout.clear();
|
|
143
167
|
resolve({ text: fullOutput, usage });
|
|
144
168
|
});
|
|
145
169
|
stream.on('error', (error) => {
|
|
170
|
+
activityTimeout.clear();
|
|
146
171
|
reject(error);
|
|
147
172
|
});
|
|
148
173
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-chat-executor.js","sourceRoot":"","sources":["../../src/commands/api-chat-executor.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"api-chat-executor.js","sourceRoot":"","sources":["../../src/commands/api-chat-executor.ts"],"names":[],"mappings":"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"}
|