shennian 0.1.22 → 0.1.24
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/src/index.js +12 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/log-reporter.d.ts +19 -0
- package/dist/src/log-reporter.d.ts.map +1 -0
- package/dist/src/log-reporter.js +34 -0
- package/dist/src/log-reporter.js.map +1 -0
- package/dist/src/relay/client.d.ts.map +1 -1
- package/dist/src/relay/client.js +7 -0
- package/dist/src/relay/client.js.map +1 -1
- package/dist/src/session/handlers/chat.d.ts.map +1 -1
- package/dist/src/session/handlers/chat.js +28 -0
- package/dist/src/session/handlers/chat.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/src/index.js
CHANGED
|
@@ -16,6 +16,7 @@ import { SERVERS, regionToUrl, urlToRegion } from './region.js';
|
|
|
16
16
|
import { getCurrentVersion, handleStartupCrashCheck, checkForUpdate } from './upgrade/engine.js';
|
|
17
17
|
import { detectAgents } from './agents/detect.js';
|
|
18
18
|
import { getCachedAgentInfos, resolveAgentInfos } from './agents/model-registry.js';
|
|
19
|
+
import { initCliLogReporter, reportLog } from './log-reporter.js';
|
|
19
20
|
const SHENNIAN_DIR = path.join(os.homedir(), '.shennian');
|
|
20
21
|
const PID_FILE = path.join(SHENNIAN_DIR, 'daemon.pid');
|
|
21
22
|
function httpToWs(url) {
|
|
@@ -87,7 +88,11 @@ program
|
|
|
87
88
|
const detectedAgents = detectAgents();
|
|
88
89
|
const agentList = detectedAgents.map((a) => a.type);
|
|
89
90
|
const cachedAgentInfos = getCachedAgentInfos(detectedAgents);
|
|
91
|
+
if (config.machineId) {
|
|
92
|
+
initCliLogReporter(serverUrl, config.machineId);
|
|
93
|
+
}
|
|
90
94
|
console.log(`[${new Date().toISOString()}] Connecting to ${wsUrl}... (v${cliVersion}) agents: ${agentList.join(',')}`);
|
|
95
|
+
reportLog({ level: 'info', wsEvent: 'daemon.start', metadata: { version: cliVersion, agents: agentList } });
|
|
91
96
|
const client = new CliRelayClient({
|
|
92
97
|
serverUrl: wsUrl,
|
|
93
98
|
machineToken: config.machineToken,
|
|
@@ -95,6 +100,7 @@ program
|
|
|
95
100
|
agentList,
|
|
96
101
|
onConnected: () => {
|
|
97
102
|
console.log(`[${new Date().toISOString()}] ✓ Connected`);
|
|
103
|
+
reportLog({ level: 'info', wsEvent: 'daemon.connected' });
|
|
98
104
|
if (cachedAgentInfos.some((agent) => agent.models.length > 0)) {
|
|
99
105
|
client.sendEvent({
|
|
100
106
|
type: 'event',
|
|
@@ -134,9 +140,13 @@ program
|
|
|
134
140
|
}).catch(() => { });
|
|
135
141
|
void scheduleAutoUpgrade(client, config.autoUpgrade ?? 'patch');
|
|
136
142
|
},
|
|
137
|
-
onDisconnected: () =>
|
|
143
|
+
onDisconnected: () => {
|
|
144
|
+
console.log(`[${new Date().toISOString()}] ⚠ Disconnected, reconnecting...`);
|
|
145
|
+
reportLog({ level: 'warn', wsEvent: 'daemon.disconnected' });
|
|
146
|
+
},
|
|
138
147
|
onReq: (req) => {
|
|
139
148
|
console.log(`[${new Date().toISOString()}] [req] ${req.method}`);
|
|
149
|
+
reportLog({ level: 'info', type: 'ws', wsEvent: req.method, wsDirection: 'in', traceId: req.traceId });
|
|
140
150
|
void sessionManager.handleReq(req);
|
|
141
151
|
},
|
|
142
152
|
});
|
|
@@ -147,6 +157,7 @@ program
|
|
|
147
157
|
process.stdin.resume();
|
|
148
158
|
const shutdown = () => {
|
|
149
159
|
console.log(chalk.gray('\nDisconnecting...'));
|
|
160
|
+
reportLog({ level: 'info', wsEvent: 'daemon.stop' });
|
|
150
161
|
sessionManager.cleanup();
|
|
151
162
|
client.disconnect();
|
|
152
163
|
try {
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,oCAAoC;AAEpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAe,MAAM,aAAa,CAAA;AAC5E,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,cAAc,EAAmC,MAAM,qBAAqB,CAAA;AACjI,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
type LogLevel = 'debug' | 'info' | 'warn' | 'error';
|
|
2
|
+
type LogType = 'http' | 'ws' | 'internal';
|
|
3
|
+
type LogEntry = {
|
|
4
|
+
traceId?: string;
|
|
5
|
+
sessionId?: string;
|
|
6
|
+
type?: LogType;
|
|
7
|
+
level: LogLevel;
|
|
8
|
+
wsEvent?: string;
|
|
9
|
+
wsDirection?: 'in' | 'out';
|
|
10
|
+
errorMessage?: string;
|
|
11
|
+
errorStack?: string;
|
|
12
|
+
durationMs?: number;
|
|
13
|
+
metadata?: unknown;
|
|
14
|
+
};
|
|
15
|
+
export declare function initCliLogReporter(serverUrl: string, machineId: string): void;
|
|
16
|
+
export declare function generateTraceId(): string;
|
|
17
|
+
export declare function reportLog(entry: LogEntry): void;
|
|
18
|
+
export {};
|
|
19
|
+
//# sourceMappingURL=log-reporter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-reporter.d.ts","sourceRoot":"","sources":["../../src/log-reporter.ts"],"names":[],"mappings":"AAEA,KAAK,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;AACnD,KAAK,OAAO,GAAG,MAAM,GAAG,IAAI,GAAG,UAAU,CAAA;AAEzC,KAAK,QAAQ,GAAG;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,KAAK,EAAE,QAAQ,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,IAAI,GAAG,KAAK,CAAA;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAKD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAG7E;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAuB/C"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import crypto from 'node:crypto';
|
|
2
|
+
let _serverUrl;
|
|
3
|
+
let _machineId;
|
|
4
|
+
export function initCliLogReporter(serverUrl, machineId) {
|
|
5
|
+
_serverUrl = serverUrl.replace(/\/$/, '');
|
|
6
|
+
_machineId = machineId;
|
|
7
|
+
}
|
|
8
|
+
export function generateTraceId() {
|
|
9
|
+
return crypto.randomBytes(8).toString('hex');
|
|
10
|
+
}
|
|
11
|
+
export function reportLog(entry) {
|
|
12
|
+
if (!_serverUrl || !_machineId)
|
|
13
|
+
return;
|
|
14
|
+
const body = {
|
|
15
|
+
traceId: entry.traceId || generateTraceId(),
|
|
16
|
+
machineId: _machineId,
|
|
17
|
+
source: 'cli',
|
|
18
|
+
type: entry.type ?? 'internal',
|
|
19
|
+
level: entry.level,
|
|
20
|
+
wsEvent: entry.wsEvent,
|
|
21
|
+
wsDirection: entry.wsDirection,
|
|
22
|
+
sessionId: entry.sessionId,
|
|
23
|
+
errorMessage: entry.errorMessage,
|
|
24
|
+
errorStack: entry.errorStack,
|
|
25
|
+
durationMs: entry.durationMs,
|
|
26
|
+
metadata: entry.metadata,
|
|
27
|
+
};
|
|
28
|
+
fetch(`${_serverUrl}/log`, {
|
|
29
|
+
method: 'POST',
|
|
30
|
+
headers: { 'Content-Type': 'application/json' },
|
|
31
|
+
body: JSON.stringify(body),
|
|
32
|
+
}).catch(() => { });
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=log-reporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-reporter.js","sourceRoot":"","sources":["../../src/log-reporter.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAkBhC,IAAI,UAA8B,CAAA;AAClC,IAAI,UAA8B,CAAA;AAElC,MAAM,UAAU,kBAAkB,CAAC,SAAiB,EAAE,SAAiB;IACrE,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IACzC,UAAU,GAAG,SAAS,CAAA;AACxB,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,KAAe;IACvC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU;QAAE,OAAM;IAEtC,MAAM,IAAI,GAAG;QACX,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,eAAe,EAAE;QAC3C,SAAS,EAAE,UAAU;QACrB,MAAM,EAAE,KAAc;QACtB,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,UAAU;QAC9B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAA;IAED,KAAK,CAAC,GAAG,UAAU,MAAM,EAAE;QACzB,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;AACpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/relay/client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAS,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/relay/client.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAS,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3E,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,QAAQ,KAAK,IAAI,CAAA;IAC/B,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,CAAA;AAWvE,qBAAa,cAAc;IAab,OAAO,CAAC,OAAO;IAZ3B,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,cAAc,CAA6C;IACnE,OAAO,CAAC,cAAc,CAA6C;IACnE,OAAO,CAAC,YAAY,CAA6C;IACjE,OAAO,CAAC,SAAS,CAA8C;IAC/D,OAAO,CAAC,SAAS,CAA6C;IAC9D,OAAO,CAAC,QAAQ,CAAQ;IACxB,mEAAmE;IACnE,OAAO,CAAC,UAAU,CAAgC;gBAE9B,OAAO,EAAE,eAAe;IAE5C,OAAO,IAAI,IAAI;IAkEf,UAAU,IAAI,IAAI;IAKlB,OAAO,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI;IAM5B,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAMlC;;;;OAIG;IACH,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAmBvC,QAAQ,IAAI,aAAa;IAIzB,OAAO,CAAC,WAAW;IAiBnB,2EAA2E;IAC3E,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,SAAS;IAkBjB,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,OAAO;CAwBhB"}
|
package/dist/src/relay/client.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
// @arch docs/architecture/cli/daemon.md#关键数据流
|
|
2
2
|
// @test src/__tests__/e2e-relay.ts
|
|
3
3
|
import WebSocket from 'ws';
|
|
4
|
+
import { generateTraceId } from '../log-reporter.js';
|
|
4
5
|
const HEARTBEAT_TIMEOUT = 90_000;
|
|
5
6
|
const MAX_RECONNECT_DELAY = 30_000;
|
|
6
7
|
const BASE_RECONNECT_DELAY = 1_000;
|
|
@@ -94,11 +95,15 @@ export class CliRelayClient {
|
|
|
94
95
|
sendRes(res) {
|
|
95
96
|
if (this.state !== 'connected' || !this.ws)
|
|
96
97
|
return;
|
|
98
|
+
if (!res.traceId)
|
|
99
|
+
res.traceId = generateTraceId();
|
|
97
100
|
this.ws.send(JSON.stringify(res));
|
|
98
101
|
}
|
|
99
102
|
sendEvent(event) {
|
|
100
103
|
if (this.state !== 'connected' || !this.ws)
|
|
101
104
|
return;
|
|
105
|
+
if (!event.traceId)
|
|
106
|
+
event.traceId = generateTraceId();
|
|
102
107
|
this.ws.send(JSON.stringify(event));
|
|
103
108
|
}
|
|
104
109
|
/**
|
|
@@ -107,6 +112,8 @@ export class CliRelayClient {
|
|
|
107
112
|
* On reconnect, all unacked events are resent in order.
|
|
108
113
|
*/
|
|
109
114
|
sendAgentEvent(event) {
|
|
115
|
+
if (!event.traceId)
|
|
116
|
+
event.traceId = generateTraceId();
|
|
110
117
|
if (!event.id) {
|
|
111
118
|
// No id means no ack tracking — send directly
|
|
112
119
|
this.sendEvent(event);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/relay/client.ts"],"names":[],"mappings":"AAAA,8CAA8C;AAC9C,mCAAmC;AAEnC,OAAO,SAAS,MAAM,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/relay/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../../../src/session/handlers/chat.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,gBAAgB,CAAA;AACzD,OAAO,KAAK,EAAiB,qBAAqB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../../../src/session/handlers/chat.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAa,MAAM,gBAAgB,CAAA;AACzD,OAAO,KAAK,EAAiB,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAoJvE,wBAAsB,cAAc,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA8IjG;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAUlG"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// @test src/__tests__/session-manager.test.ts
|
|
3
3
|
import os from 'node:os';
|
|
4
4
|
import { createAgent } from '../../agents/adapter.js';
|
|
5
|
+
import { reportLog } from '../../log-reporter.js';
|
|
5
6
|
function extractSummary(text) {
|
|
6
7
|
const newline = text.indexOf('\n');
|
|
7
8
|
const end = newline > 0 ? Math.min(newline, 80) : Math.min(text.length, 80);
|
|
@@ -16,6 +17,15 @@ function bindAdapterEvents(runtime, sessionId, agentType, adapter) {
|
|
|
16
17
|
if (event.agentSessionId)
|
|
17
18
|
activeSession.agentSessionId = event.agentSessionId;
|
|
18
19
|
}
|
|
20
|
+
if (event.state !== 'delta') {
|
|
21
|
+
reportLog({
|
|
22
|
+
level: 'info',
|
|
23
|
+
sessionId,
|
|
24
|
+
wsEvent: `agent.${event.state}`,
|
|
25
|
+
wsDirection: 'out',
|
|
26
|
+
metadata: { runId: event.runId, seq: event.seq, agentType },
|
|
27
|
+
});
|
|
28
|
+
}
|
|
19
29
|
const runKey = `${sessionId}:${event.runId}`;
|
|
20
30
|
if (event.state === 'delta' && !event.thinking && event.text) {
|
|
21
31
|
runtime.runTextAcc.set(runKey, (runtime.runTextAcc.get(runKey) ?? '') + event.text);
|
|
@@ -191,8 +201,26 @@ export async function handleChatSend(runtime, req) {
|
|
|
191
201
|
try {
|
|
192
202
|
session.currentRunId = null;
|
|
193
203
|
session.nextEventSeq = 0;
|
|
204
|
+
reportLog({
|
|
205
|
+
level: 'info',
|
|
206
|
+
sessionId,
|
|
207
|
+
wsEvent: 'chat.send.start',
|
|
208
|
+
metadata: { reqId: req.id, agentType: requestedAgentType, modelId },
|
|
209
|
+
});
|
|
194
210
|
await session.adapter.send(text, modelId);
|
|
211
|
+
reportLog({
|
|
212
|
+
level: 'info',
|
|
213
|
+
sessionId,
|
|
214
|
+
wsEvent: 'chat.send.done',
|
|
215
|
+
metadata: { reqId: req.id },
|
|
216
|
+
});
|
|
195
217
|
runtime.client.sendRes({ type: 'res', id: req.id, ok: true });
|
|
218
|
+
reportLog({
|
|
219
|
+
level: 'info',
|
|
220
|
+
sessionId,
|
|
221
|
+
wsEvent: 'chat.send.res',
|
|
222
|
+
metadata: { reqId: req.id, ok: true },
|
|
223
|
+
});
|
|
196
224
|
}
|
|
197
225
|
catch (err) {
|
|
198
226
|
runtime.sessions.delete(sessionId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../../src/session/handlers/chat.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,8CAA8C;AAE9C,OAAO,EAAE,MAAM,SAAS,CAAA;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../../src/session/handlers/chat.ts"],"names":[],"mappings":"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"}
|