@clappstore/connect 0.7.13 → 0.7.14
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-client.d.ts +2 -2
- package/dist/agent-client.d.ts.map +1 -1
- package/dist/agent-client.js +44 -66
- package/dist/agent-client.js.map +1 -1
- package/package.json +1 -1
package/dist/agent-client.d.ts
CHANGED
|
@@ -15,6 +15,8 @@ export declare class AgentClient {
|
|
|
15
15
|
private pending;
|
|
16
16
|
private started;
|
|
17
17
|
private loadedSessions;
|
|
18
|
+
/** Accumulated text chunks from agent_message_chunk notifications during an active prompt */
|
|
19
|
+
private messageChunks;
|
|
18
20
|
constructor(options: AgentClientOptions);
|
|
19
21
|
/** Spawn the ACP subprocess and run the initialize + session/load handshake */
|
|
20
22
|
start(): Promise<void>;
|
|
@@ -22,8 +24,6 @@ export declare class AgentClient {
|
|
|
22
24
|
sendIntent(intent: IntentMessage): Promise<string>;
|
|
23
25
|
/** Send a chat message to the agent and get a response */
|
|
24
26
|
sendMessage(text: string, sessionKey?: string): Promise<string>;
|
|
25
|
-
private readAssistantReplyFromSessionLog;
|
|
26
|
-
private readLatestAssistantText;
|
|
27
27
|
private ensureSessionLoaded;
|
|
28
28
|
/** Kill the ACP subprocess */
|
|
29
29
|
stop(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-client.d.ts","sourceRoot":"","sources":["../src/agent-client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;
|
|
1
|
+
{"version":3,"file":"agent-client.d.ts","sourceRoot":"","sources":["../src/agent-client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAoBD,2FAA2F;AAC3F,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,IAAI,CAA6B;IACzC,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAqB;IAC3C,6FAA6F;IAC7F,OAAO,CAAC,aAAa,CAAgB;gBAEzB,OAAO,EAAE,kBAAkB;IAMvC,+EAA+E;IACzE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB5B,yDAAyD;IACnD,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAkCxD,0DAA0D;IACpD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YA0CvD,mBAAmB;IAYjC,8BAA8B;IAC9B,IAAI,IAAI,IAAI;IAmBZ,OAAO,CAAC,YAAY;IAmDpB,OAAO,CAAC,UAAU;IAoClB,OAAO,CAAC,GAAG;CAyBZ"}
|
package/dist/agent-client.js
CHANGED
|
@@ -11,6 +11,8 @@ export class AgentClient {
|
|
|
11
11
|
pending = new Map();
|
|
12
12
|
started = false;
|
|
13
13
|
loadedSessions = new Set();
|
|
14
|
+
/** Accumulated text chunks from agent_message_chunk notifications during an active prompt */
|
|
15
|
+
messageChunks = [];
|
|
14
16
|
constructor(options) {
|
|
15
17
|
this.session = options.session;
|
|
16
18
|
this.agentToken = options.agentToken;
|
|
@@ -43,16 +45,25 @@ export class AgentClient {
|
|
|
43
45
|
}
|
|
44
46
|
await this.ensureSessionLoaded(this.session);
|
|
45
47
|
const prompt = `[CLAPP_INTENT] ${intent.intent} ${JSON.stringify(intent.payload)}`;
|
|
48
|
+
// Clear chunk buffer before sending
|
|
49
|
+
this.messageChunks = [];
|
|
46
50
|
const result = (await this.rpc("session/prompt", {
|
|
47
51
|
sessionId: this.session,
|
|
48
52
|
prompt: [{ type: "text", text: prompt }],
|
|
49
53
|
}));
|
|
50
|
-
//
|
|
54
|
+
// 1) Use accumulated streamed chunks (primary path per ACP protocol)
|
|
55
|
+
const streamed = this.messageChunks.join("").trim();
|
|
56
|
+
this.messageChunks = [];
|
|
57
|
+
if (streamed)
|
|
58
|
+
return streamed;
|
|
59
|
+
// 2) Fallback: try direct RPC content (some ACP versions may include it)
|
|
51
60
|
if (result && typeof result === "object" && "content" in result) {
|
|
52
61
|
const texts = (result.content ?? [])
|
|
53
62
|
.map((c) => c.text)
|
|
54
63
|
.filter(Boolean);
|
|
55
|
-
|
|
64
|
+
const joined = texts.join("\n").trim();
|
|
65
|
+
if (joined)
|
|
66
|
+
return joined;
|
|
56
67
|
}
|
|
57
68
|
return "";
|
|
58
69
|
}
|
|
@@ -63,78 +74,32 @@ export class AgentClient {
|
|
|
63
74
|
}
|
|
64
75
|
const targetSession = sessionKey ?? this.session;
|
|
65
76
|
await this.ensureSessionLoaded(targetSession);
|
|
66
|
-
const before = await this.readLatestAssistantText(targetSession) ?? await this.readLatestAssistantText(this.session);
|
|
67
77
|
console.log(`[acp:sendMessage] Sending to session ${targetSession}: "${text.slice(0, 50)}..."`);
|
|
78
|
+
// Clear chunk buffer before sending
|
|
79
|
+
this.messageChunks = [];
|
|
68
80
|
const result = (await this.rpc("session/prompt", {
|
|
69
81
|
sessionId: targetSession,
|
|
70
82
|
prompt: [{ type: "text", text }],
|
|
71
83
|
}));
|
|
72
|
-
|
|
73
|
-
|
|
84
|
+
// 1) Use accumulated streamed chunks (primary path per ACP protocol)
|
|
85
|
+
const streamed = this.messageChunks.join("").trim();
|
|
86
|
+
this.messageChunks = [];
|
|
87
|
+
if (streamed) {
|
|
88
|
+
console.log(`[acp:sendMessage] Got streamed response (${streamed.length} chars)`);
|
|
89
|
+
return streamed;
|
|
90
|
+
}
|
|
91
|
+
// 2) Fallback: try direct RPC content (some ACP versions may include it)
|
|
74
92
|
if (result && typeof result === "object" && "content" in result) {
|
|
75
93
|
const texts = (result.content ?? [])
|
|
76
94
|
.map((c) => c.text)
|
|
77
95
|
.filter(Boolean);
|
|
78
96
|
const joined = texts.join("\n").trim();
|
|
79
|
-
if (joined)
|
|
97
|
+
if (joined) {
|
|
98
|
+
console.log(`[acp:sendMessage] Got RPC content response (${joined.length} chars)`);
|
|
80
99
|
return joined;
|
|
81
|
-
}
|
|
82
|
-
// 2) Fallback: pull latest assistant text from session logs (target first, then base session)
|
|
83
|
-
return await this.readAssistantReplyFromSessionLog(targetSession, before);
|
|
84
|
-
}
|
|
85
|
-
async readAssistantReplyFromSessionLog(sessionKey, previous) {
|
|
86
|
-
const deadline = Date.now() + 10_000;
|
|
87
|
-
const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
|
|
88
|
-
while (Date.now() < deadline) {
|
|
89
|
-
const candidate = await this.readLatestAssistantText(sessionKey);
|
|
90
|
-
if (candidate && candidate !== previous)
|
|
91
|
-
return candidate;
|
|
92
|
-
const fallback = await this.readLatestAssistantText(this.session);
|
|
93
|
-
if (fallback && fallback !== previous)
|
|
94
|
-
return fallback;
|
|
95
|
-
await sleep(500);
|
|
96
|
-
}
|
|
97
|
-
return "";
|
|
98
|
-
}
|
|
99
|
-
async readLatestAssistantText(sessionKey) {
|
|
100
|
-
try {
|
|
101
|
-
const { homedir } = await import("node:os");
|
|
102
|
-
const { resolve } = await import("node:path");
|
|
103
|
-
const { readFile } = await import("node:fs/promises");
|
|
104
|
-
const sessionsPath = resolve(homedir(), ".openclaw", "agents", "main", "sessions", "sessions.json");
|
|
105
|
-
const sessionsRaw = await readFile(sessionsPath, "utf-8");
|
|
106
|
-
const sessions = JSON.parse(sessionsRaw);
|
|
107
|
-
const meta = sessions[sessionKey];
|
|
108
|
-
if (!meta?.sessionId)
|
|
109
|
-
return "";
|
|
110
|
-
const jsonlPath = resolve(homedir(), ".openclaw", "agents", "main", "sessions", `${meta.sessionId}.jsonl`);
|
|
111
|
-
const jsonlRaw = await readFile(jsonlPath, "utf-8");
|
|
112
|
-
const lines = jsonlRaw.trim().split("\n");
|
|
113
|
-
for (let i = lines.length - 1; i >= 0; i--) {
|
|
114
|
-
try {
|
|
115
|
-
const row = JSON.parse(lines[i]);
|
|
116
|
-
if (row?.type !== "message")
|
|
117
|
-
continue;
|
|
118
|
-
const msg = row?.message;
|
|
119
|
-
if (!msg || msg.role !== "assistant")
|
|
120
|
-
continue;
|
|
121
|
-
const parts = Array.isArray(msg.content) ? msg.content : [];
|
|
122
|
-
const texts = parts
|
|
123
|
-
.filter((p) => p?.type === "text" && typeof p?.text === "string")
|
|
124
|
-
.map((p) => p.text)
|
|
125
|
-
.filter(Boolean);
|
|
126
|
-
const joined = texts.join("\n").trim();
|
|
127
|
-
if (joined)
|
|
128
|
-
return joined;
|
|
129
|
-
}
|
|
130
|
-
catch {
|
|
131
|
-
// ignore malformed line
|
|
132
|
-
}
|
|
133
100
|
}
|
|
134
101
|
}
|
|
135
|
-
|
|
136
|
-
console.warn(`[acp:sendMessage] Log read failed: ${err.message}`);
|
|
137
|
-
}
|
|
102
|
+
console.warn(`[acp:sendMessage] No response content received. Result:`, JSON.stringify(result)?.slice(0, 200));
|
|
138
103
|
return "";
|
|
139
104
|
}
|
|
140
105
|
async ensureSessionLoaded(sessionId) {
|
|
@@ -151,6 +116,7 @@ export class AgentClient {
|
|
|
151
116
|
stop() {
|
|
152
117
|
this.started = false;
|
|
153
118
|
this.loadedSessions.clear();
|
|
119
|
+
this.messageChunks = [];
|
|
154
120
|
this.rl?.close();
|
|
155
121
|
this.rl = null;
|
|
156
122
|
if (this.proc) {
|
|
@@ -215,15 +181,27 @@ export class AgentClient {
|
|
|
215
181
|
// Not JSON — ignore
|
|
216
182
|
return;
|
|
217
183
|
}
|
|
218
|
-
//
|
|
219
|
-
if (msg.id == null)
|
|
184
|
+
// Handle notifications (no id field) — capture agent_message_chunk for streamed responses
|
|
185
|
+
if (msg.id == null) {
|
|
186
|
+
if (msg.method === "session/update") {
|
|
187
|
+
const params = msg.params;
|
|
188
|
+
if (params?.update?.sessionUpdate === "agent_message_chunk") {
|
|
189
|
+
const text = params.update.content?.text;
|
|
190
|
+
if (typeof text === "string") {
|
|
191
|
+
this.messageChunks.push(text);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}
|
|
220
195
|
return;
|
|
221
|
-
|
|
196
|
+
}
|
|
197
|
+
const id = msg.id;
|
|
198
|
+
const pending = this.pending.get(id);
|
|
222
199
|
if (!pending)
|
|
223
200
|
return;
|
|
224
|
-
this.pending.delete(
|
|
201
|
+
this.pending.delete(id);
|
|
225
202
|
if (msg.error) {
|
|
226
|
-
|
|
203
|
+
const errObj = msg.error;
|
|
204
|
+
pending.reject(new Error(errObj.message));
|
|
227
205
|
}
|
|
228
206
|
else {
|
|
229
207
|
pending.resolve(msg.result);
|
package/dist/agent-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-client.js","sourceRoot":"","sources":["../src/agent-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAkB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-client.js","sourceRoot":"","sources":["../src/agent-client.ts"],"names":[],"mappings":"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"}
|