@ai-support-agent/cli 0.0.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-runner.d.ts +2 -2
- package/dist/agent-runner.d.ts.map +1 -1
- package/dist/agent-runner.js +2 -2
- package/dist/agent-runner.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 +47 -89
- package/dist/appsync-subscriber.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.map +1 -1
- package/dist/commands/api-chat-executor.js +46 -56
- package/dist/commands/api-chat-executor.js.map +1 -1
- package/dist/commands/chat-executor.d.ts.map +1 -1
- package/dist/commands/chat-executor.js +1 -2
- 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 +3 -72
- package/dist/commands/claude-code-runner.d.ts.map +1 -1
- package/dist/commands/claude-code-runner.js +24 -288
- 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/shared-chat-utils.d.ts +4 -0
- package/dist/commands/shared-chat-utils.d.ts.map +1 -1
- package/dist/commands/shared-chat-utils.js +7 -0
- package/dist/commands/shared-chat-utils.js.map +1 -1
- package/dist/constants.d.ts +2 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +4 -1
- package/dist/constants.js.map +1 -1
- package/dist/process-manager.d.ts +1 -19
- package/dist/process-manager.d.ts.map +1 -1
- package/dist/process-manager.js +3 -121
- package/dist/process-manager.js.map +1 -1
- 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 -70
- package/dist/terminal/terminal-websocket.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/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/package.json +1 -1
|
@@ -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":";;;AAAA,iDAAuD;AACvD,+BAA2B;AAE3B,2CAIoB;AAEpB,2CAAoD;AACpD,qCAAiC;AAUjC,MAAa,mBAAmB;IACb,SAAS,GAAG,IAAI,GAAG,EAA0B,CAAA;IAC7C,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAA;IACzE,QAAQ,GAAG,KAAK,CAAA;IAExB,WAAW,CACT,OAA4B,EAC5B,OAAe,EACf,OAKC;QAED,MAAM,YAAY,GAAoB;YACpC,IAAI,EAAE,OAAO;YACb,OAAO;YACP,OAAO;YACP,OAAO;SACR,CAAA;QAED,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IACpD,CAAC;IAEO,UAAU,CAAC,WAAmB,EAAE,YAA6B;QACnE,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,mBAAmB,CAAC,CAAA;QACvD,MAAM,KAAK,GAAG,IAAA,oBAAI,EAAC,UAAU,EAAE,EAAE,EAAE;YACjC,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC;SAC7C,CAAC,CAAA;QAEF,MAAM,OAAO,GAAmB;YAC9B,KAAK;YACL,OAAO,EAAE,YAAY,CAAC,OAAO;YAC7B,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,YAAY,IAAI,CAAC;YAChE,YAAY;SACb,CAAA;QAED,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAExC,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAY,EAAE,EAAE;YACnC,IAAI,CAAC,IAAA,kCAAsB,EAAC,GAAG,CAAC;gBAAE,OAAM;YACxC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;QAC9B,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAChC,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAM;YACzB,eAAM,CAAC,IAAI,CACT,qBAAqB,WAAW,iBAAiB,IAAI,YAAY,MAAM,GAAG,CAC3E,CAAA;YACD,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;QACnC,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QACxB,eAAM,CAAC,IAAI,CAAC,4BAA4B,WAAW,SAAS,KAAK,CAAC,GAAG,GAAG,CAAC,CAAA;IAC3E,CAAC;IAEO,iBAAiB,CAAC,WAAmB;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAC/C,IAAI,OAAO;YAAE,OAAO,CAAC,YAAY,GAAG,CAAC,CAAA;IACvC,CAAC;IAEO,kBAAkB,CAAC,GAAyB;QAClD,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,SAAS;gBACZ,eAAM,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,WAAW,2BAA2B,CAAC,CAAA;gBAClE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;gBACvC,MAAK;YACP,KAAK,OAAO;gBACV,eAAM,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,WAAW,WAAW,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;gBAChE,MAAK;YACP,KAAK,SAAS;gBACZ,eAAM,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,WAAW,UAAU,CAAC,CAAA;gBACjD,MAAK;QACT,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,WAAmB;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAC/C,IAAI,CAAC,OAAO;YAAE,OAAM;QAEpB,IAAI,OAAO,CAAC,YAAY,IAAI,sCAA0B,EAAE,CAAC;YACvD,eAAM,CAAC,KAAK,CACV,WAAW,WAAW,2BAA2B,sCAA0B,oBAAoB,CAChG,CAAA;YACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAClC,OAAM;QACR,CAAC;QAED,OAAO,CAAC,YAAY,EAAE,CAAA;QACtB,eAAM,CAAC,IAAI,CACT,cAAc,WAAW,OAAO,0CAA8B,eAAe,OAAO,CAAC,YAAY,IAAI,sCAA0B,GAAG,CACnI,CAAA;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YACtC,IAAI,IAAI,CAAC,QAAQ;gBAAE,OAAM;YACzB,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QACpD,CAAC,EAAE,0CAA8B,CAAC,CAAA;QAClC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED,eAAe;QACb,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpD,IAAI,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;gBACtC,eAAM,CAAC,KAAK,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,YAAoB,yCAA6B;QAC7D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QAEpB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE;YAAE,YAAY,CAAC,KAAK,CAAC,CAAA;QACpE,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAA;QAE1B,MAAM,gBAAgB,GAAoB,EAAE,CAAA;QAE5C,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpD,IAAI,OAAO,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBAC5B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAA;gBACxC,eAAM,CAAC,KAAK,CAAC,oBAAoB,WAAW,EAAE,CAAC,CAAA;YACjD,CAAC;YAED,gBAAgB,CAAC,IAAI,CACnB,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC5B,eAAM,CAAC,IAAI,CAAC,iBAAiB,WAAW,YAAY,CAAC,CAAA;oBACrD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;oBAC7B,OAAO,EAAE,CAAA;gBACX,CAAC,EAAE,SAAS,CAAC,CAAA;gBAEb,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;oBAC9B,YAAY,CAAC,KAAK,CAAC,CAAA;oBACnB,OAAO,EAAE,CAAA;gBACX,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CACH,CAAA;QACH,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;QACnC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAA;IAC5B,CAAC;CACF;AApJD,kDAoJC"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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"}
|
|
@@ -11,6 +11,9 @@ const constants_1 = require("../constants");
|
|
|
11
11
|
const logger_1 = require("../logger");
|
|
12
12
|
const types_1 = require("../types");
|
|
13
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");
|
|
14
17
|
const process_manager_1 = require("./process-manager");
|
|
15
18
|
const shared_chat_utils_1 = require("./shared-chat-utils");
|
|
16
19
|
/** 実行中の API チャットを commandId で管理 */
|
|
@@ -60,7 +63,7 @@ async function executeApiChatCommand(payload, commandId, client, config, agentId
|
|
|
60
63
|
}
|
|
61
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}`);
|
|
62
65
|
// done チャンクに usage 情報を含める
|
|
63
|
-
|
|
66
|
+
await (0, shared_chat_utils_1.sendDoneChunk)(sendChunk, {
|
|
64
67
|
text: result.text,
|
|
65
68
|
usage: {
|
|
66
69
|
totalInputTokens: result.usage.inputTokens,
|
|
@@ -68,7 +71,6 @@ async function executeApiChatCommand(payload, commandId, client, config, agentId
|
|
|
68
71
|
totalTokens: result.usage.inputTokens + result.usage.outputTokens,
|
|
69
72
|
},
|
|
70
73
|
});
|
|
71
|
-
await sendChunk('done', doneContent);
|
|
72
74
|
return (0, types_1.successResult)(result.text);
|
|
73
75
|
}
|
|
74
76
|
catch (error) {
|
|
@@ -107,77 +109,65 @@ async function callAnthropicApi(apiKey, message, model, maxTokens, systemPrompt,
|
|
|
107
109
|
});
|
|
108
110
|
return new Promise((resolve, reject) => {
|
|
109
111
|
let fullOutput = '';
|
|
110
|
-
let buffer = '';
|
|
111
112
|
const usage = { inputTokens: 0, outputTokens: 0 };
|
|
112
113
|
const stream = response.data;
|
|
114
|
+
const lineParser = new stream_parser_1.StreamLineParser();
|
|
113
115
|
// アクティビティベースタイムアウト: ストリームデータ受信が途絶えたら中止
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
activityTimer = setTimeout(() => {
|
|
119
|
-
logger_1.logger.warn(`[api-chat] Stream timed out after ${constants_1.CHAT_TIMEOUT / 1000}s of inactivity`);
|
|
120
|
-
stream.destroy(new Error(`Stream timed out after ${constants_1.CHAT_TIMEOUT / 1000}s of inactivity`));
|
|
121
|
-
}, constants_1.CHAT_TIMEOUT);
|
|
122
|
-
};
|
|
123
|
-
resetActivityTimer();
|
|
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
|
+
});
|
|
124
120
|
stream.on('data', (chunk) => {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
//
|
|
129
|
-
|
|
130
|
-
for (const line of lines) {
|
|
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) => {
|
|
131
126
|
if (!line.startsWith(constants_1.SSE_PREFIX))
|
|
132
|
-
|
|
127
|
+
return;
|
|
133
128
|
const data = line.slice(constants_1.SSE_PREFIX.length).trim();
|
|
134
129
|
if (data === constants_1.SSE_DONE)
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
}
|
|
145
|
-
else if (event.type === constants_1.SSE_EVENT.MESSAGE_DELTA) {
|
|
146
|
-
// message_delta イベントから output_tokens を取得
|
|
147
|
-
const outputTokens = event.usage?.output_tokens;
|
|
148
|
-
if (typeof outputTokens === 'number') {
|
|
149
|
-
usage.outputTokens = outputTokens;
|
|
150
|
-
}
|
|
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;
|
|
151
139
|
}
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
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;
|
|
158
146
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
}
|
|
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);
|
|
166
153
|
}
|
|
167
154
|
}
|
|
168
|
-
|
|
169
|
-
|
|
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
|
+
}
|
|
170
162
|
}
|
|
171
|
-
}
|
|
163
|
+
});
|
|
172
164
|
});
|
|
173
165
|
stream.on('end', () => {
|
|
174
|
-
|
|
175
|
-
clearTimeout(activityTimer);
|
|
166
|
+
activityTimeout.clear();
|
|
176
167
|
resolve({ text: fullOutput, usage });
|
|
177
168
|
});
|
|
178
169
|
stream.on('error', (error) => {
|
|
179
|
-
|
|
180
|
-
clearTimeout(activityTimer);
|
|
170
|
+
activityTimeout.clear();
|
|
181
171
|
reject(error);
|
|
182
172
|
});
|
|
183
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAIzC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAe,KAAK,qBAAqB,EAAiB,MAAM,UAAU,CAAA;AAW1M,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1F;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,oCAAoC;AACpC,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAE1E;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,EACjB,YAAY,CAAC,EAAE,iBAAiB,EAChC,cAAc,CAAC,EAAE,aAAa,EAC9B,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,aAAa,CAAC,CAcxB;
|
|
1
|
+
{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAIzC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAe,KAAK,qBAAqB,EAAiB,MAAM,UAAU,CAAA;AAW1M,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1F;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,oCAAoC;AACpC,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAE1E;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,EACjB,YAAY,CAAC,EAAE,iBAAiB,EAChC,cAAc,CAAC,EAAE,aAAa,EAC9B,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,qBAAqB,EACrC,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,aAAa,CAAC,CAcxB;AAuID,wBAAgB,2BAA2B,CAAC,iBAAiB,EAAE,YAAY,EAAE,GAAG,MAAM,CAMrF;AAED,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CAGR"}
|
|
@@ -158,11 +158,10 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
158
158
|
}
|
|
159
159
|
logger_1.logger.info(`[chat] Chat command completed [${commandId}]: output=${result.text.length} chars, ${getChunkIndex()} chunks sent, duration=${result.metadata.durationMs}ms`);
|
|
160
160
|
// 完了チャンクを送信(metadata を含める)
|
|
161
|
-
|
|
161
|
+
await (0, shared_chat_utils_1.sendDoneChunk)(sendChunk, {
|
|
162
162
|
text: result.text,
|
|
163
163
|
metadata: result.metadata,
|
|
164
164
|
});
|
|
165
|
-
await sendChunk('done', doneContent);
|
|
166
165
|
// ダウンロードした一時ファイルをクリーンアップ
|
|
167
166
|
cleanupDownloads?.();
|
|
168
167
|
return (0, types_1.successResult)(result.text);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":";;;AAwBA,8CAEC;AAGD,oDAEC;AASD,gDAwBC;
|
|
1
|
+
{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare function buildCleanEnv(): Record<string, string>;
|
|
2
|
+
/** テスト用のキャッシュリセット */
|
|
3
|
+
export declare function _resetCleanEnvCache(): void;
|
|
4
|
+
/** Claude CLI の引数配列を構築 */
|
|
5
|
+
export declare function buildClaudeArgs(message: string, options?: {
|
|
6
|
+
allowedTools?: string[];
|
|
7
|
+
addDirs?: string[];
|
|
8
|
+
locale?: string;
|
|
9
|
+
mcpConfigPath?: string;
|
|
10
|
+
systemPrompt?: string;
|
|
11
|
+
}): string[];
|
|
12
|
+
//# sourceMappingURL=claude-code-args.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-code-args.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-args.ts"],"names":[],"mappings":"AAOA,wBAAgB,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAStD;AAED,qBAAqB;AACrB,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C;AAED,0BAA0B;AAC1B,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IACR,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,GACA,MAAM,EAAE,CA6CV"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.buildCleanEnv = buildCleanEnv;
|
|
7
|
+
exports._resetCleanEnvCache = _resetCleanEnvCache;
|
|
8
|
+
exports.buildClaudeArgs = buildClaudeArgs;
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
10
|
+
/** CLAUDECODE / CLAUDE_CODE_* 環境変数を除外した env を構築
|
|
11
|
+
* ただし CLAUDE_CODE_OAUTH_TOKEN は認証に必要なため保持する
|
|
12
|
+
* プロセス生存中は結果不変のためキャッシュする */
|
|
13
|
+
let cachedCleanEnv = null;
|
|
14
|
+
function buildCleanEnv() {
|
|
15
|
+
if (cachedCleanEnv)
|
|
16
|
+
return { ...cachedCleanEnv };
|
|
17
|
+
const cleanEnv = {};
|
|
18
|
+
for (const [key, value] of Object.entries(process.env)) {
|
|
19
|
+
if (key === 'CLAUDECODE' || (key.startsWith('CLAUDE_CODE_') && key !== 'CLAUDE_CODE_OAUTH_TOKEN'))
|
|
20
|
+
continue;
|
|
21
|
+
if (value !== undefined)
|
|
22
|
+
cleanEnv[key] = value;
|
|
23
|
+
}
|
|
24
|
+
cachedCleanEnv = cleanEnv;
|
|
25
|
+
return { ...cleanEnv };
|
|
26
|
+
}
|
|
27
|
+
/** テスト用のキャッシュリセット */
|
|
28
|
+
function _resetCleanEnvCache() {
|
|
29
|
+
cachedCleanEnv = null;
|
|
30
|
+
}
|
|
31
|
+
/** Claude CLI の引数配列を構築 */
|
|
32
|
+
function buildClaudeArgs(message, options) {
|
|
33
|
+
const args = ['-p', '--output-format', 'stream-json', '--verbose'];
|
|
34
|
+
if (options?.allowedTools?.length) {
|
|
35
|
+
for (const tool of options.allowedTools) {
|
|
36
|
+
args.push('--allowedTools', tool);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
if (options?.addDirs?.length) {
|
|
40
|
+
for (const dir of options.addDirs) {
|
|
41
|
+
const resolved = dir.replace(/^~/, os_1.default.homedir());
|
|
42
|
+
args.push('--add-dir', resolved);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (options?.mcpConfigPath) {
|
|
46
|
+
args.push('--mcp-config', options.mcpConfigPath);
|
|
47
|
+
}
|
|
48
|
+
// システムプロンプトを構築: 言語設定 + サーバー設定 + file_upload 指示
|
|
49
|
+
const promptParts = [];
|
|
50
|
+
if (options?.locale) {
|
|
51
|
+
promptParts.push(options.locale === 'ja'
|
|
52
|
+
? 'Always respond in Japanese. Use Japanese for all explanations and communications.'
|
|
53
|
+
: 'Always respond in English. Use English for all explanations and communications.');
|
|
54
|
+
}
|
|
55
|
+
if (options?.systemPrompt) {
|
|
56
|
+
promptParts.push(options.systemPrompt);
|
|
57
|
+
}
|
|
58
|
+
if (options?.mcpConfigPath) {
|
|
59
|
+
promptParts.push([
|
|
60
|
+
'CRITICAL FILE DELIVERY RULE:',
|
|
61
|
+
'When you create or modify a file using the Write tool, the user CANNOT see or download the file unless you upload it.',
|
|
62
|
+
'You MUST call the mcp__ai-support-agent__file_upload tool AFTER every Write tool call.',
|
|
63
|
+
'Required parameters for file_upload:',
|
|
64
|
+
'- filePath: the absolute path of the file you just wrote',
|
|
65
|
+
'- filename: the display name (e.g., "mbc-logo.svg")',
|
|
66
|
+
'- conversationId: from <message_metadata> in the user message',
|
|
67
|
+
'- messageId: from <message_metadata> in the user message',
|
|
68
|
+
'- projectCode: from <message_metadata> in the user message',
|
|
69
|
+
'If you skip the upload, the file is invisible to the user. Always upload.',
|
|
70
|
+
].join('\n'));
|
|
71
|
+
}
|
|
72
|
+
if (promptParts.length > 0) {
|
|
73
|
+
args.push('--append-system-prompt', promptParts.join('\n\n'));
|
|
74
|
+
}
|
|
75
|
+
args.push(message);
|
|
76
|
+
return args;
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=claude-code-args.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-code-args.js","sourceRoot":"","sources":["../../src/commands/claude-code-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import type { ChatChunkType } from '../types';
|
|
2
|
+
export { buildClaudeArgs, buildCleanEnv, _resetCleanEnvCache } from './claude-code-args';
|
|
3
|
+
export { processStreamJsonLine, parseFileUploadResult } from './claude-code-stream';
|
|
4
|
+
export type { StreamJsonContentBlock, StreamJsonLine, StreamJsonMcpServer } from './claude-code-stream';
|
|
2
5
|
/** Claude Code CLI の実行結果 */
|
|
3
6
|
export interface ClaudeCodeResult {
|
|
4
7
|
text: string;
|
|
@@ -9,48 +12,6 @@ export interface ClaudeCodeResult {
|
|
|
9
12
|
durationMs: number;
|
|
10
13
|
};
|
|
11
14
|
}
|
|
12
|
-
/** stream-json の assistant/user メッセージ内のコンテンツブロック */
|
|
13
|
-
export interface StreamJsonContentBlock {
|
|
14
|
-
type: 'text' | 'tool_use' | 'tool_result' | 'tool_reference';
|
|
15
|
-
text?: string;
|
|
16
|
-
name?: string;
|
|
17
|
-
id?: string;
|
|
18
|
-
input?: Record<string, unknown>;
|
|
19
|
-
tool_use_id?: string;
|
|
20
|
-
/** 組み込みツールでは string、MCP ツールでは {type, text}[] の配列 */
|
|
21
|
-
content?: string | Array<{
|
|
22
|
-
type: string;
|
|
23
|
-
text?: string;
|
|
24
|
-
}>;
|
|
25
|
-
}
|
|
26
|
-
/** stream-json の MCP サーバー接続情報 */
|
|
27
|
-
export interface StreamJsonMcpServer {
|
|
28
|
-
name: string;
|
|
29
|
-
status: string;
|
|
30
|
-
error?: string;
|
|
31
|
-
}
|
|
32
|
-
/** stream-json の1行(NDJSON)の型定義 */
|
|
33
|
-
export interface StreamJsonLine {
|
|
34
|
-
type: string;
|
|
35
|
-
subtype?: string;
|
|
36
|
-
message?: {
|
|
37
|
-
content?: StreamJsonContentBlock[];
|
|
38
|
-
};
|
|
39
|
-
result?: string;
|
|
40
|
-
tools?: string[];
|
|
41
|
-
mcp_servers?: StreamJsonMcpServer[];
|
|
42
|
-
}
|
|
43
|
-
export declare function buildCleanEnv(): Record<string, string>;
|
|
44
|
-
/** テスト用のキャッシュリセット */
|
|
45
|
-
export declare function _resetCleanEnvCache(): void;
|
|
46
|
-
/** Claude CLI の引数配列を構築 */
|
|
47
|
-
export declare function buildClaudeArgs(message: string, options?: {
|
|
48
|
-
allowedTools?: string[];
|
|
49
|
-
addDirs?: string[];
|
|
50
|
-
locale?: string;
|
|
51
|
-
mcpConfigPath?: string;
|
|
52
|
-
systemPrompt?: string;
|
|
53
|
-
}): string[];
|
|
54
15
|
/** Claude Code CLI の実行ハンドル(プロセス管理用) */
|
|
55
16
|
export interface ClaudeCodeHandle {
|
|
56
17
|
result: Promise<ClaudeCodeResult>;
|
|
@@ -73,34 +34,4 @@ export interface RunClaudeCodeOptions {
|
|
|
73
34
|
* ClaudeCodeHandle を返す: result Promise と kill 関数
|
|
74
35
|
*/
|
|
75
36
|
export declare function runClaudeCode(options: RunClaudeCodeOptions): ClaudeCodeHandle;
|
|
76
|
-
/**
|
|
77
|
-
* stream-json の NDJSON 1行をパースし、テキストやツール呼び出し情報を処理する
|
|
78
|
-
* sendChunk は fire-and-forget で呼び出される(同期的に状態を返すため)
|
|
79
|
-
*
|
|
80
|
-
* @returns newSentTextLength: 送信済みテキスト長, text: resultイベントのテキスト(undefinedなら未取得)
|
|
81
|
-
*/
|
|
82
|
-
export declare function processStreamJsonLine(line: string, sendChunk: (type: ChatChunkType, content: string) => Promise<void>, pid: number, state: {
|
|
83
|
-
sentTextLength: number;
|
|
84
|
-
pendingFileUploadIds?: Set<string>;
|
|
85
|
-
pendingToolNames?: Map<string, string>;
|
|
86
|
-
}): {
|
|
87
|
-
newSentTextLength: number;
|
|
88
|
-
text?: string;
|
|
89
|
-
};
|
|
90
|
-
/**
|
|
91
|
-
* file_upload ツールの結果をパースし、file_attachment チャンク用データを返す
|
|
92
|
-
*
|
|
93
|
-
* MCP ツールの tool_result.content は配列形式: [{type: "text", text: "..."}]
|
|
94
|
-
* 組み込みツールの tool_result.content は文字列形式
|
|
95
|
-
*/
|
|
96
|
-
export declare function parseFileUploadResult(content: string | Array<{
|
|
97
|
-
type: string;
|
|
98
|
-
text?: string;
|
|
99
|
-
}> | undefined): {
|
|
100
|
-
fileId: string;
|
|
101
|
-
s3Key: string;
|
|
102
|
-
filename: string;
|
|
103
|
-
contentType: string;
|
|
104
|
-
fileSize: number;
|
|
105
|
-
} | null;
|
|
106
37
|
//# sourceMappingURL=claude-code-runner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAS7C,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxF,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACnF,YAAY,EAAE,sBAAsB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAEvG,4BAA4B;AAC5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,EAAE,CAAA;QACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;QACvB,SAAS,EAAE,OAAO,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;CACF;AAED,uCAAuC;AACvC,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACjC,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB;AAED,2BAA2B;AAC3B,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,gBAAgB,CAgH7E"}
|