@celljs/ta-client 4.5.0 → 4.6.0

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.
@@ -7,12 +7,19 @@ const session_reducer_1 = require("./session-reducer");
7
7
  * itself after a reconnect, from the events it missed or, if those are gone, from the session.
8
8
  */
9
9
  class SessionStore {
10
- constructor(connection, sessionId) {
10
+ constructor(connection, sessionId, options = {}) {
11
+ var _a;
11
12
  this.connection = connection;
12
13
  this.sessionId = sessionId;
13
14
  this.current = session_reducer_1.SessionReducer.initial();
14
15
  this.listeners = new Set();
16
+ this.eventListeners = new Set();
15
17
  this.stop = [];
18
+ /** Calls of client tools this store is running or answering now, by id. */
19
+ this.running = new Set();
20
+ /** Results not yet taken by the server, by call id. */
21
+ this.results = new Map();
22
+ this.clientTools = new Map(((_a = options.clientTools) !== null && _a !== void 0 ? _a : []).map(tool => [tool.definition.name, tool]));
16
23
  }
17
24
  get state() {
18
25
  return this.current;
@@ -33,6 +40,11 @@ class SessionStore {
33
40
  this.listeners.add(listener);
34
41
  return () => this.listeners.delete(listener);
35
42
  }
43
+ /** Each new event of the session, once the state has taken it in. */
44
+ onEvent(listener) {
45
+ this.eventListeners.add(listener);
46
+ return () => this.eventListeners.delete(listener);
47
+ }
36
48
  /** Sends a message with a new id; a resend after a lost connection must reuse the id. */
37
49
  prompt(message, input = {}) {
38
50
  return this.connection.server.prompt(this.sessionId, { clientMessageId: crypto.randomUUID(), ...input, message });
@@ -47,7 +59,7 @@ class SessionStore {
47
59
  this.lastSeq = result.lastSeq;
48
60
  }
49
61
  this.apply(result.events);
50
- this.update({ ...this.current, pendingUi: result.pendingUi, working: result.info.isStreaming });
62
+ this.update({ ...this.current, pendingUi: result.pendingUi, pendingClientTools: result.pendingClientTools, working: result.info.isStreaming });
51
63
  return result;
52
64
  }
53
65
  async reload() {
@@ -57,6 +69,7 @@ class SessionStore {
57
69
  apply(events) {
58
70
  let state = this.current;
59
71
  let replaced = false;
72
+ const applied = [];
60
73
  for (const { sessionId, seq, event } of events) {
61
74
  if (sessionId !== this.sessionId || (this.lastSeq !== undefined && seq <= this.lastSeq)) {
62
75
  continue;
@@ -64,9 +77,15 @@ class SessionStore {
64
77
  this.lastSeq = seq;
65
78
  state = session_reducer_1.SessionReducer.reduce(state, event);
66
79
  replaced || (replaced = event.type === 'session_replaced');
80
+ applied.push(event);
67
81
  }
68
82
  // One notification per batch: a UI renders once however many deltas arrived.
69
83
  this.update(state);
84
+ for (const event of applied) {
85
+ for (const listener of this.eventListeners) {
86
+ listener(event);
87
+ }
88
+ }
70
89
  if (replaced) {
71
90
  void this.reload();
72
91
  }
@@ -77,6 +96,47 @@ class SessionStore {
77
96
  for (const listener of this.listeners) {
78
97
  listener(state);
79
98
  }
99
+ this.runClientTools(state);
100
+ }
101
+ }
102
+ runClientTools(state) {
103
+ for (const request of state.pendingClientTools) {
104
+ const tool = this.clientTools.get(request.toolName);
105
+ if (tool && !this.running.has(request.id)) {
106
+ this.running.add(request.id);
107
+ void this.answer(tool, request);
108
+ }
109
+ }
110
+ for (const id of this.results.keys()) {
111
+ if (!state.pendingClientTools.some(request => request.id === id)) {
112
+ this.results.delete(id);
113
+ }
114
+ }
115
+ }
116
+ /** Runs a call once: a result that could not be sent is sent again after a reconnect, not made again. */
117
+ async answer(tool, request) {
118
+ try {
119
+ let result = this.results.get(request.id);
120
+ if (!result) {
121
+ result = await this.run(tool, request);
122
+ this.results.set(request.id, result);
123
+ }
124
+ await this.connection.server.respondClientTool(this.sessionId, result);
125
+ this.results.delete(request.id);
126
+ }
127
+ catch (_a) {
128
+ // The connection was lost; the reconnect sends the result if the call still waits.
129
+ }
130
+ finally {
131
+ this.running.delete(request.id);
132
+ }
133
+ }
134
+ async run(tool, request) {
135
+ try {
136
+ return { id: request.id, output: await tool.run(request.input, request) };
137
+ }
138
+ catch (error) {
139
+ return { id: request.id, output: error instanceof Error ? error.message : String(error), isError: true };
80
140
  }
81
141
  }
82
142
  }
@@ -1 +1 @@
1
- {"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/common/session-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../src/common/session-store.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { type TaErrorCode, type TaEventEnvelope, type TaServer } from '@celljs/ta-protocol';
1
+ import { type TaAuthEvent, type TaAuthServer, TaErrorCode, type TaEventEnvelope, type TaPackageServer, type TaRelayServer, type TaServer, type TaSettingsServer, type TaTerminalServer, type TaWorkspaceServer } from '@celljs/ta-protocol';
2
2
  /** A failed call. `code` is set for failures the server names. */
3
3
  export declare class TaRemoteError extends Error {
4
4
  readonly code?: TaErrorCode | undefined;
@@ -14,41 +14,90 @@ export interface TaConnectionOptions {
14
14
  reconnectDelayMs?: number;
15
15
  /** Default 10000. */
16
16
  maxReconnectDelayMs?: number;
17
+ /**
18
+ * Another way to ta serve than a WebSocket to `url`, such as a relay (RelaySocket of @celljs/ta-relay):
19
+ * a new socket for each connection, which takes care of access itself.
20
+ */
21
+ createSocket?: () => TaSocket;
22
+ }
23
+ /** What TaConnection uses of a WebSocket. */
24
+ export interface TaSocket {
25
+ readonly readyState: number;
26
+ onopen: ((event?: unknown) => void) | null;
27
+ onmessage: ((message: {
28
+ data: unknown;
29
+ }) => void) | null;
30
+ onclose: ((event?: unknown) => void) | null;
31
+ onerror?: ((event?: unknown) => void) | null;
32
+ send(text: string): void;
33
+ close(): void;
17
34
  }
18
35
  interface PendingCall {
19
36
  resolve(result: unknown): void;
20
37
  reject(error: Error): void;
21
38
  }
22
39
  type EventsListener = (events: TaEventEnvelope[]) => void;
40
+ type TerminalListener = (terminalId: string, data: string, exitCode?: number) => void;
41
+ type ExtensionDataListener = (name: string, keys: string[], cwd?: string) => void;
42
+ type AuthEventListener = (loginId: string, event: TaAuthEvent) => void;
23
43
  type OpenListener = () => void;
44
+ type CloseListener = () => void;
45
+ type ReconnectingListener = (delayMs: number, attempt: number) => void;
24
46
  /**
25
47
  * A connection to `ta serve` on the `WebSocket` of the platform, with no other dependency, so that it
26
48
  * fits a browser, Electron or a mobile app. It reconnects until closed; `onOpen` runs each time, for
27
- * attaching again ({@link SessionStore} does).
49
+ * attaching again ({@link SessionStore} does). Each service of ta serve is a property; all of them go
50
+ * over the one WebSocket.
51
+ *
52
+ * Calls fail when the connection is down; they are not queued, because only the caller knows whether to resend.
28
53
  */
29
54
  export declare class TaConnection {
30
55
  protected readonly options: TaConnectionOptions;
31
- /** Calls fail when the connection is down; they are not queued, because only the caller knows whether to resend. */
32
56
  readonly server: TaServer;
33
- protected socket?: WebSocket;
57
+ readonly workspace: TaWorkspaceServer;
58
+ readonly terminals: TaTerminalServer;
59
+ readonly settings: TaSettingsServer;
60
+ readonly packages: TaPackageServer;
61
+ readonly auth: TaAuthServer;
62
+ readonly relay: TaRelayServer;
63
+ protected socket?: TaSocket;
34
64
  protected closed: boolean;
35
65
  protected attempts: number;
36
66
  protected reconnectTimer?: ReturnType<typeof setTimeout>;
37
67
  protected nextId: number;
38
68
  protected readonly pending: Map<number, PendingCall>;
39
69
  protected readonly eventListeners: Set<EventsListener>;
70
+ protected readonly terminalListeners: Set<TerminalListener>;
71
+ protected readonly extensionDataListeners: Set<ExtensionDataListener>;
72
+ protected readonly authListeners: Set<AuthEventListener>;
40
73
  protected readonly openListeners: Set<OpenListener>;
74
+ protected readonly closeListeners: Set<CloseListener>;
75
+ protected readonly reconnectingListeners: Set<ReconnectingListener>;
41
76
  constructor(options: TaConnectionOptions);
42
77
  /** Resolves when the first connection is open, or rejects if it cannot be made; later losses reconnect. */
43
78
  connect(): Promise<void>;
44
79
  close(): void;
45
80
  onEvents(listener: EventsListener): () => void;
81
+ /** Output of the terminals of this connection (TaTerminalServer.openTerminal). */
82
+ onTerminalData(listener: TerminalListener): () => void;
83
+ /** Keys of the data of packages that changed (TaClient.onExtensionData), for the data this connection read; `cwd` for a key of a directory. */
84
+ onExtensionData(listener: ExtensionDataListener): () => void;
85
+ /** What happens during the sign-ins of this connection (TaAuthServer.login). */
86
+ onAuthEvent(listener: AuthEventListener): () => void;
46
87
  onOpen(listener: OpenListener): () => void;
88
+ /** Runs each time an open connection is lost; it reconnects unless closed. */
89
+ onClose(listener: CloseListener): () => void;
90
+ /** Runs each time it waits to try again: how long, and which try it is (1 for the first after a loss). */
91
+ onReconnecting(listener: ReconnectingListener): () => void;
92
+ /** While the connection is down, tries again now rather than at the end of the wait, which starts over; otherwise does nothing. */
93
+ reconnect(): void;
47
94
  /** With `resolve` and `reject`: the first connection, whose failure is the caller's to handle. */
48
95
  protected open(resolve?: () => void, reject?: (error: Error) => void): void;
96
+ protected createWebSocket(): TaSocket;
49
97
  protected scheduleReconnect(): void;
50
98
  protected failPending(): void;
51
- protected call(method: string, params: unknown[]): Promise<unknown>;
99
+ protected service<T extends object>(name: string): T;
100
+ protected call(service: string, method: string, params: unknown[]): Promise<unknown>;
52
101
  protected receive(text: string): void;
53
102
  }
54
103
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"ta-connection.d.ts","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,KAAK,WAAW,EAAoB,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpJ,kEAAkE;AAClE,qBAAa,aAAc,SAAQ,KAAK;IAGhC,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW;IAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IAH1B,YACI,OAAO,EAAE,MAAM,EACN,IAAI,CAAC,EAAE,WAAW,YAAA,EAClB,IAAI,CAAC,EAAE,MAAM,YAAA,EAIzB;CACJ;AAED,MAAM,WAAW,mBAAmB;IAChC,+BAA+B;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,2FAA2F;IAC3F,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,qBAAqB;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,UAAU,WAAW;IACjB,OAAO,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CAC9B;AAUD,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;AAC1D,KAAK,YAAY,GAAG,MAAM,IAAI,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,YAAY;IAkBT,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,mBAAmB;IAjB3D,oHAAoH;IACpH,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAKtB;IAEH,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAC7B,SAAS,CAAC,MAAM,UAAS;IACzB,SAAS,CAAC,QAAQ,SAAK;IACvB,SAAS,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IACzD,SAAS,CAAC,MAAM,SAAK;IACrB,SAAS,CAAC,QAAQ,CAAC,OAAO,2BAAkC;IAC5D,SAAS,CAAC,QAAQ,CAAC,cAAc,sBAA6B;IAC9D,SAAS,CAAC,QAAQ,CAAC,aAAa,oBAA2B;IAE3D,YAA+B,OAAO,EAAE,mBAAmB,EAAI;IAE/D,2GAA2G;IAC3G,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAEvB;IAED,KAAK,IAAI,IAAI,CAIZ;IAED,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,IAAI,CAG7C;IAED,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,IAAI,CAGzC;IAED,kGAAkG;IAClG,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAuB1E;IAED,SAAS,CAAC,iBAAiB,IAAI,IAAI,CAOlC;IAED,SAAS,CAAC,WAAW,IAAI,IAAI,CAK5B;IAED,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAelE;IAED,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAqBpC;CACJ"}
1
+ {"version":3,"file":"ta-connection.d.ts","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"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"}
@@ -15,21 +15,32 @@ exports.TaRemoteError = TaRemoteError;
15
15
  /**
16
16
  * A connection to `ta serve` on the `WebSocket` of the platform, with no other dependency, so that it
17
17
  * fits a browser, Electron or a mobile app. It reconnects until closed; `onOpen` runs each time, for
18
- * attaching again ({@link SessionStore} does).
18
+ * attaching again ({@link SessionStore} does). Each service of ta serve is a property; all of them go
19
+ * over the one WebSocket.
20
+ *
21
+ * Calls fail when the connection is down; they are not queued, because only the caller knows whether to resend.
19
22
  */
20
23
  class TaConnection {
21
24
  constructor(options) {
22
25
  this.options = options;
23
- /** Calls fail when the connection is down; they are not queued, because only the caller knows whether to resend. */
24
- this.server = new Proxy({}, {
25
- get: (_target, method) => (...params) => this.call(method, params),
26
- });
26
+ this.server = this.service(ta_protocol_1.TA_SERVER_SERVICE);
27
+ this.workspace = this.service(ta_protocol_1.TA_WORKSPACE_SERVICE);
28
+ this.terminals = this.service(ta_protocol_1.TA_TERMINAL_SERVICE);
29
+ this.settings = this.service(ta_protocol_1.TA_SETTINGS_SERVICE);
30
+ this.packages = this.service(ta_protocol_1.TA_PACKAGE_SERVICE);
31
+ this.auth = this.service(ta_protocol_1.TA_AUTH_SERVICE);
32
+ this.relay = this.service(ta_protocol_1.TA_RELAY_SERVICE);
27
33
  this.closed = false;
28
34
  this.attempts = 0;
29
35
  this.nextId = 0;
30
36
  this.pending = new Map();
31
37
  this.eventListeners = new Set();
38
+ this.terminalListeners = new Set();
39
+ this.extensionDataListeners = new Set();
40
+ this.authListeners = new Set();
32
41
  this.openListeners = new Set();
42
+ this.closeListeners = new Set();
43
+ this.reconnectingListeners = new Set();
33
44
  }
34
45
  /** Resolves when the first connection is open, or rejects if it cannot be made; later losses reconnect. */
35
46
  connect() {
@@ -45,16 +56,50 @@ class TaConnection {
45
56
  this.eventListeners.add(listener);
46
57
  return () => this.eventListeners.delete(listener);
47
58
  }
59
+ /** Output of the terminals of this connection (TaTerminalServer.openTerminal). */
60
+ onTerminalData(listener) {
61
+ this.terminalListeners.add(listener);
62
+ return () => this.terminalListeners.delete(listener);
63
+ }
64
+ /** Keys of the data of packages that changed (TaClient.onExtensionData), for the data this connection read; `cwd` for a key of a directory. */
65
+ onExtensionData(listener) {
66
+ this.extensionDataListeners.add(listener);
67
+ return () => this.extensionDataListeners.delete(listener);
68
+ }
69
+ /** What happens during the sign-ins of this connection (TaAuthServer.login). */
70
+ onAuthEvent(listener) {
71
+ this.authListeners.add(listener);
72
+ return () => this.authListeners.delete(listener);
73
+ }
48
74
  onOpen(listener) {
49
75
  this.openListeners.add(listener);
50
76
  return () => this.openListeners.delete(listener);
51
77
  }
78
+ /** Runs each time an open connection is lost; it reconnects unless closed. */
79
+ onClose(listener) {
80
+ this.closeListeners.add(listener);
81
+ return () => this.closeListeners.delete(listener);
82
+ }
83
+ /** Runs each time it waits to try again: how long, and which try it is (1 for the first after a loss). */
84
+ onReconnecting(listener) {
85
+ this.reconnectingListeners.add(listener);
86
+ return () => this.reconnectingListeners.delete(listener);
87
+ }
88
+ /** While the connection is down, tries again now rather than at the end of the wait, which starts over; otherwise does nothing. */
89
+ reconnect() {
90
+ var _a;
91
+ const state = (_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState;
92
+ if (this.closed || state === WebSocket.OPEN || state === WebSocket.CONNECTING) {
93
+ return;
94
+ }
95
+ clearTimeout(this.reconnectTimer);
96
+ this.attempts = 0;
97
+ this.open();
98
+ }
52
99
  /** With `resolve` and `reject`: the first connection, whose failure is the caller's to handle. */
53
100
  open(resolve, reject) {
54
101
  let opened = false;
55
- const url = new URL(this.options.url);
56
- url.searchParams.set('token', this.options.token);
57
- const socket = new WebSocket(url);
102
+ const socket = this.options.createSocket ? this.options.createSocket() : this.createWebSocket();
58
103
  this.socket = socket;
59
104
  socket.onopen = () => {
60
105
  opened = true;
@@ -69,12 +114,21 @@ class TaConnection {
69
114
  this.failPending();
70
115
  if (reject && !opened) {
71
116
  reject(new TaRemoteError(`Cannot connect to ${this.options.url}.`));
117
+ return;
72
118
  }
73
- else {
74
- this.scheduleReconnect();
119
+ if (opened) {
120
+ for (const listener of this.closeListeners) {
121
+ listener();
122
+ }
75
123
  }
124
+ this.scheduleReconnect();
76
125
  };
77
126
  }
127
+ createWebSocket() {
128
+ const url = new URL(this.options.url);
129
+ url.searchParams.set('token', this.options.token);
130
+ return new WebSocket(url);
131
+ }
78
132
  scheduleReconnect() {
79
133
  if (this.closed) {
80
134
  return;
@@ -82,17 +136,25 @@ class TaConnection {
82
136
  const { reconnectDelayMs = 250, maxReconnectDelayMs = 10000 } = this.options;
83
137
  const delay = Math.min(reconnectDelayMs * 2 ** this.attempts++, maxReconnectDelayMs);
84
138
  this.reconnectTimer = setTimeout(() => this.open(), delay);
139
+ for (const listener of this.reconnectingListeners) {
140
+ listener(delay, this.attempts);
141
+ }
85
142
  }
86
143
  failPending() {
87
144
  for (const call of this.pending.values()) {
88
- call.reject(new TaRemoteError('The connection to ta serve was lost.'));
145
+ call.reject(new TaRemoteError('The connection to ta serve was lost.', ta_protocol_1.TaErrorCode.CONNECTION_LOST, 'Send it again once the connection is back.'));
89
146
  }
90
147
  this.pending.clear();
91
148
  }
92
- call(method, params) {
149
+ service(name) {
150
+ return new Proxy({}, {
151
+ get: (_target, method) => (...params) => this.call(name, method, params),
152
+ });
153
+ }
154
+ call(service, method, params) {
93
155
  const socket = this.socket;
94
156
  if ((socket === null || socket === void 0 ? void 0 : socket.readyState) !== WebSocket.OPEN) {
95
- return Promise.reject(new TaRemoteError('Not connected to ta serve.'));
157
+ return Promise.reject(new TaRemoteError('Not connected to ta serve.', ta_protocol_1.TaErrorCode.CONNECTION_LOST, 'Try again once the connection is back.'));
96
158
  }
97
159
  const id = ++this.nextId;
98
160
  // JSON has no undefined: a left-out optional argument must not arrive as null.
@@ -102,11 +164,11 @@ class TaConnection {
102
164
  }
103
165
  return new Promise((resolve, reject) => {
104
166
  this.pending.set(id, { resolve, reject });
105
- socket.send(JSON.stringify({ jsonrpc: '2.0', id, method: `${ta_protocol_1.TA_SERVER_SERVICE}/${method}`, params: params.slice(0, length) }));
167
+ socket.send(JSON.stringify({ jsonrpc: '2.0', id, method: `${service}/${method}`, params: params.slice(0, length) }));
106
168
  });
107
169
  }
108
170
  receive(text) {
109
- var _a, _b;
171
+ var _a, _b, _c, _d, _e;
110
172
  const message = JSON.parse(text);
111
173
  if (message.method === `${ta_protocol_1.TA_CLIENT_SERVICE}/onEvents`) {
112
174
  const [events] = message.params;
@@ -116,13 +178,38 @@ class TaConnection {
116
178
  (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
117
179
  return;
118
180
  }
181
+ if (message.method === `${ta_protocol_1.TA_CLIENT_SERVICE}/onTerminalData`) {
182
+ const [terminalId, data, exitCode] = message.params;
183
+ for (const listener of this.terminalListeners) {
184
+ // JSON has no undefined: a terminal still running may send null.
185
+ listener(terminalId, data, exitCode !== null && exitCode !== void 0 ? exitCode : undefined);
186
+ }
187
+ (_b = this.socket) === null || _b === void 0 ? void 0 : _b.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
188
+ return;
189
+ }
190
+ if (message.method === `${ta_protocol_1.TA_CLIENT_SERVICE}/onAuthEvent`) {
191
+ const [loginId, event] = message.params;
192
+ for (const listener of this.authListeners) {
193
+ listener(loginId, event);
194
+ }
195
+ (_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
196
+ return;
197
+ }
198
+ if (message.method === `${ta_protocol_1.TA_CLIENT_SERVICE}/onExtensionData`) {
199
+ const [name, keys, cwd] = message.params;
200
+ for (const listener of this.extensionDataListeners) {
201
+ listener(name, keys, cwd !== null && cwd !== void 0 ? cwd : undefined);
202
+ }
203
+ (_d = this.socket) === null || _d === void 0 ? void 0 : _d.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
204
+ return;
205
+ }
119
206
  const call = this.pending.get(message.id);
120
207
  if (!call) {
121
208
  return;
122
209
  }
123
210
  this.pending.delete(message.id);
124
211
  if (message.error) {
125
- const data = (_b = message.error.data) === null || _b === void 0 ? void 0 : _b.data;
212
+ const data = (_e = message.error.data) === null || _e === void 0 ? void 0 : _e.data;
126
213
  call.reject(new TaRemoteError(message.error.message, data === null || data === void 0 ? void 0 : data.code, data === null || data === void 0 ? void 0 : data.hint));
127
214
  }
128
215
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"ta-connection.js","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ta-connection.js","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@celljs/ta-client",
3
- "version": "4.5.0",
3
+ "version": "4.6.0",
4
4
  "description": "A client of ta serve for any JavaScript runtime: connection and UI-independent session state",
5
5
  "homepage": "https://github.com/cellbang/cell",
6
6
  "bugs": {
@@ -28,7 +28,7 @@
28
28
  "watch": "tsc -b -w --preserveWatchOutput"
29
29
  },
30
30
  "dependencies": {
31
- "@celljs/ta-protocol": "4.5.0"
31
+ "@celljs/ta-protocol": "4.6.0"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@earendil-works/pi-ai": "^1.5.0",
@@ -37,6 +37,29 @@ describe('SessionReducer', () => {
37
37
  ] as never);
38
38
  });
39
39
 
40
+ it('takes the usage of a streaming message, and the arguments of a tool call as they come', () => {
41
+ const usage = { input: 10, output: 3 };
42
+ const state = run([
43
+ { type: 'message_start', message: assistant() },
44
+ { type: 'message_update', usage, assistantMessageEvent: { type: 'toolcall_start', contentIndex: 0, id: 'c1', toolName: 'bash' } },
45
+ { type: 'message_update', usage, assistantMessageEvent: { type: 'toolcall_delta', contentIndex: 0, delta: '{"comm' } },
46
+ { type: 'message_update', usage, assistantMessageEvent: { type: 'toolcall_delta', contentIndex: 0, delta: 'and":"ls"}' } },
47
+ ]);
48
+ expect(state.messages[0]).toMatchObject({ usage, content: [{ type: 'toolCall', id: 'c1', partialJson: '{"command":"ls"}' }] });
49
+ });
50
+
51
+ it('knows where a run starts, and when pi compacts or retries', () => {
52
+ const started = run([{ type: 'message_start', message: { role: 'user', content: 'a' } }, { type: 'agent_start' }]);
53
+ expect(started.runStart).toBe(1);
54
+ const compacting = run([{ type: 'compaction_start', reason: 'threshold' }], started);
55
+ expect(compacting.compacting).toBe('threshold');
56
+ expect(run([{ type: 'compaction_end', reason: 'threshold', aborted: false, willRetry: false }], compacting).compacting).toBeUndefined();
57
+ const retrying = run([{ type: 'auto_retry_start', attempt: 1, maxAttempts: 3, delayMs: 2000, errorMessage: 'overloaded' }], started);
58
+ expect(retrying.retry).toEqual({ attempt: 1, maxAttempts: 3, delayMs: 2000, errorMessage: 'overloaded' });
59
+ expect(run([{ type: 'auto_retry_end', success: true, attempt: 1 }], retrying).retry).toBeUndefined();
60
+ expect(run([{ type: 'agent_settled', aborted: false }], retrying).retry).toBeUndefined();
61
+ });
62
+
40
63
  it('follows a tool run', () => {
41
64
  const started = run([{ type: 'tool_execution_start', toolCallId: 'c1', toolName: 'bash', args: { command: 'ls' } }]);
42
65
  expect(started.tools.c1).toEqual({ toolName: 'bash', args: { command: 'ls' }, status: 'running' });
@@ -53,6 +76,25 @@ describe('SessionReducer', () => {
53
76
  expect(run([{ type: 'ui_request_resolved', id: 'u1' }], waiting).pendingUi).toEqual([]);
54
77
  });
55
78
 
79
+ it('tells nested tool calls by their parent', () => {
80
+ const state = run([{ type: 'tool_execution_start', toolCallId: 'n1', toolName: 'read', args: {}, parentToolCallId: 'c1' }]);
81
+ expect(state.tools.n1.parentToolCallId).toBe('c1');
82
+ });
83
+
84
+ it('tracks calls of client tools until they are resolved', () => {
85
+ const request = { type: 'client_tool_request', id: 't1', toolName: 'pick', input: {} };
86
+ const waiting = run([request]);
87
+ expect(waiting.pendingClientTools).toEqual([request] as never);
88
+ expect(run([{ type: 'client_tool_resolved', id: 't1' }], waiting).pendingClientTools).toEqual([]);
89
+ });
90
+
91
+ it('keeps the latest notices', () => {
92
+ const notices = Array.from({ length: 25 }, (_, i) => ({ type: 'extension_ui_request', id: `n${i}`, method: 'notify', message: `m${i}` }));
93
+ const state = run(notices);
94
+ expect(state.notices).toHaveLength(20);
95
+ expect(state.notices.at(-1)).toEqual({ id: 'n24', message: 'm24', type: 'info' });
96
+ });
97
+
56
98
  it('keeps what extensions set with setStatus', () => {
57
99
  const set = run([{ type: 'extension_ui_request', id: 'u', method: 'setStatus', statusKey: 'k', statusText: 'on' }]);
58
100
  expect(set.status).toEqual({ k: 'on' });