@celljs/ta-client 4.5.1 → 4.6.1

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.
@@ -1,4 +1,4 @@
1
- import { TA_CLIENT_SERVICE, TA_SERVER_SERVICE } from '@celljs/ta-protocol';
1
+ import { TA_AUTH_SERVICE, TA_CLIENT_SERVICE, TA_PACKAGE_SERVICE, TA_RELAY_SERVICE, TA_SERVER_SERVICE, TA_SETTINGS_SERVICE, TA_TERMINAL_SERVICE, TA_WORKSPACE_SERVICE, TaErrorCode, } from '@celljs/ta-protocol';
2
2
  /** A failed call. `code` is set for failures the server names. */
3
3
  export class TaRemoteError extends Error {
4
4
  constructor(message, code, hint) {
@@ -11,21 +11,32 @@ export class TaRemoteError extends Error {
11
11
  /**
12
12
  * A connection to `ta serve` on the `WebSocket` of the platform, with no other dependency, so that it
13
13
  * fits a browser, Electron or a mobile app. It reconnects until closed; `onOpen` runs each time, for
14
- * attaching again ({@link SessionStore} does).
14
+ * attaching again ({@link SessionStore} does). Each service of ta serve is a property; all of them go
15
+ * over the one WebSocket.
16
+ *
17
+ * Calls fail when the connection is down; they are not queued, because only the caller knows whether to resend.
15
18
  */
16
19
  export class TaConnection {
17
20
  constructor(options) {
18
21
  this.options = options;
19
- /** Calls fail when the connection is down; they are not queued, because only the caller knows whether to resend. */
20
- this.server = new Proxy({}, {
21
- get: (_target, method) => (...params) => this.call(method, params),
22
- });
22
+ this.server = this.service(TA_SERVER_SERVICE);
23
+ this.workspace = this.service(TA_WORKSPACE_SERVICE);
24
+ this.terminals = this.service(TA_TERMINAL_SERVICE);
25
+ this.settings = this.service(TA_SETTINGS_SERVICE);
26
+ this.packages = this.service(TA_PACKAGE_SERVICE);
27
+ this.auth = this.service(TA_AUTH_SERVICE);
28
+ this.relay = this.service(TA_RELAY_SERVICE);
23
29
  this.closed = false;
24
30
  this.attempts = 0;
25
31
  this.nextId = 0;
26
32
  this.pending = new Map();
27
33
  this.eventListeners = new Set();
34
+ this.terminalListeners = new Set();
35
+ this.extensionDataListeners = new Set();
36
+ this.authListeners = new Set();
28
37
  this.openListeners = new Set();
38
+ this.closeListeners = new Set();
39
+ this.reconnectingListeners = new Set();
29
40
  }
30
41
  /** Resolves when the first connection is open, or rejects if it cannot be made; later losses reconnect. */
31
42
  connect() {
@@ -41,16 +52,50 @@ export class TaConnection {
41
52
  this.eventListeners.add(listener);
42
53
  return () => this.eventListeners.delete(listener);
43
54
  }
55
+ /** Output of the terminals of this connection (TaTerminalServer.openTerminal). */
56
+ onTerminalData(listener) {
57
+ this.terminalListeners.add(listener);
58
+ return () => this.terminalListeners.delete(listener);
59
+ }
60
+ /** Keys of the data of packages that changed (TaClient.onExtensionData), for the data this connection read; `cwd` for a key of a directory. */
61
+ onExtensionData(listener) {
62
+ this.extensionDataListeners.add(listener);
63
+ return () => this.extensionDataListeners.delete(listener);
64
+ }
65
+ /** What happens during the sign-ins of this connection (TaAuthServer.login). */
66
+ onAuthEvent(listener) {
67
+ this.authListeners.add(listener);
68
+ return () => this.authListeners.delete(listener);
69
+ }
44
70
  onOpen(listener) {
45
71
  this.openListeners.add(listener);
46
72
  return () => this.openListeners.delete(listener);
47
73
  }
74
+ /** Runs each time an open connection is lost; it reconnects unless closed. */
75
+ onClose(listener) {
76
+ this.closeListeners.add(listener);
77
+ return () => this.closeListeners.delete(listener);
78
+ }
79
+ /** Runs each time it waits to try again: how long, and which try it is (1 for the first after a loss). */
80
+ onReconnecting(listener) {
81
+ this.reconnectingListeners.add(listener);
82
+ return () => this.reconnectingListeners.delete(listener);
83
+ }
84
+ /** While the connection is down, tries again now rather than at the end of the wait, which starts over; otherwise does nothing. */
85
+ reconnect() {
86
+ var _a;
87
+ const state = (_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState;
88
+ if (this.closed || state === WebSocket.OPEN || state === WebSocket.CONNECTING) {
89
+ return;
90
+ }
91
+ clearTimeout(this.reconnectTimer);
92
+ this.attempts = 0;
93
+ this.open();
94
+ }
48
95
  /** With `resolve` and `reject`: the first connection, whose failure is the caller's to handle. */
49
96
  open(resolve, reject) {
50
97
  let opened = false;
51
- const url = new URL(this.options.url);
52
- url.searchParams.set('token', this.options.token);
53
- const socket = new WebSocket(url);
98
+ const socket = this.options.createSocket ? this.options.createSocket() : this.createWebSocket();
54
99
  this.socket = socket;
55
100
  socket.onopen = () => {
56
101
  opened = true;
@@ -65,12 +110,21 @@ export class TaConnection {
65
110
  this.failPending();
66
111
  if (reject && !opened) {
67
112
  reject(new TaRemoteError(`Cannot connect to ${this.options.url}.`));
113
+ return;
68
114
  }
69
- else {
70
- this.scheduleReconnect();
115
+ if (opened) {
116
+ for (const listener of this.closeListeners) {
117
+ listener();
118
+ }
71
119
  }
120
+ this.scheduleReconnect();
72
121
  };
73
122
  }
123
+ createWebSocket() {
124
+ const url = new URL(this.options.url);
125
+ url.searchParams.set('token', this.options.token);
126
+ return new WebSocket(url);
127
+ }
74
128
  scheduleReconnect() {
75
129
  if (this.closed) {
76
130
  return;
@@ -78,17 +132,25 @@ export class TaConnection {
78
132
  const { reconnectDelayMs = 250, maxReconnectDelayMs = 10000 } = this.options;
79
133
  const delay = Math.min(reconnectDelayMs * 2 ** this.attempts++, maxReconnectDelayMs);
80
134
  this.reconnectTimer = setTimeout(() => this.open(), delay);
135
+ for (const listener of this.reconnectingListeners) {
136
+ listener(delay, this.attempts);
137
+ }
81
138
  }
82
139
  failPending() {
83
140
  for (const call of this.pending.values()) {
84
- call.reject(new TaRemoteError('The connection to ta serve was lost.'));
141
+ call.reject(new TaRemoteError('The connection to ta serve was lost.', TaErrorCode.CONNECTION_LOST, 'Send it again once the connection is back.'));
85
142
  }
86
143
  this.pending.clear();
87
144
  }
88
- call(method, params) {
145
+ service(name) {
146
+ return new Proxy({}, {
147
+ get: (_target, method) => (...params) => this.call(name, method, params),
148
+ });
149
+ }
150
+ call(service, method, params) {
89
151
  const socket = this.socket;
90
152
  if ((socket === null || socket === void 0 ? void 0 : socket.readyState) !== WebSocket.OPEN) {
91
- return Promise.reject(new TaRemoteError('Not connected to ta serve.'));
153
+ return Promise.reject(new TaRemoteError('Not connected to ta serve.', TaErrorCode.CONNECTION_LOST, 'Try again once the connection is back.'));
92
154
  }
93
155
  const id = ++this.nextId;
94
156
  // JSON has no undefined: a left-out optional argument must not arrive as null.
@@ -98,11 +160,11 @@ export class TaConnection {
98
160
  }
99
161
  return new Promise((resolve, reject) => {
100
162
  this.pending.set(id, { resolve, reject });
101
- socket.send(JSON.stringify({ jsonrpc: '2.0', id, method: `${TA_SERVER_SERVICE}/${method}`, params: params.slice(0, length) }));
163
+ socket.send(JSON.stringify({ jsonrpc: '2.0', id, method: `${service}/${method}`, params: params.slice(0, length) }));
102
164
  });
103
165
  }
104
166
  receive(text) {
105
- var _a, _b;
167
+ var _a, _b, _c, _d, _e;
106
168
  const message = JSON.parse(text);
107
169
  if (message.method === `${TA_CLIENT_SERVICE}/onEvents`) {
108
170
  const [events] = message.params;
@@ -112,13 +174,38 @@ export class TaConnection {
112
174
  (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
113
175
  return;
114
176
  }
177
+ if (message.method === `${TA_CLIENT_SERVICE}/onTerminalData`) {
178
+ const [terminalId, data, exitCode] = message.params;
179
+ for (const listener of this.terminalListeners) {
180
+ // JSON has no undefined: a terminal still running may send null.
181
+ listener(terminalId, data, exitCode !== null && exitCode !== void 0 ? exitCode : undefined);
182
+ }
183
+ (_b = this.socket) === null || _b === void 0 ? void 0 : _b.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
184
+ return;
185
+ }
186
+ if (message.method === `${TA_CLIENT_SERVICE}/onAuthEvent`) {
187
+ const [loginId, event] = message.params;
188
+ for (const listener of this.authListeners) {
189
+ listener(loginId, event);
190
+ }
191
+ (_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
192
+ return;
193
+ }
194
+ if (message.method === `${TA_CLIENT_SERVICE}/onExtensionData`) {
195
+ const [name, keys, cwd] = message.params;
196
+ for (const listener of this.extensionDataListeners) {
197
+ listener(name, keys, cwd !== null && cwd !== void 0 ? cwd : undefined);
198
+ }
199
+ (_d = this.socket) === null || _d === void 0 ? void 0 : _d.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
200
+ return;
201
+ }
115
202
  const call = this.pending.get(message.id);
116
203
  if (!call) {
117
204
  return;
118
205
  }
119
206
  this.pending.delete(message.id);
120
207
  if (message.error) {
121
- const data = (_b = message.error.data) === null || _b === void 0 ? void 0 : _b.data;
208
+ const data = (_e = message.error.data) === null || _e === void 0 ? void 0 : _e.data;
122
209
  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));
123
210
  }
124
211
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"ta-connection.js","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAA2E,MAAM,qBAAqB,CAAC;AAEpJ,kEAAkE;AAClE,MAAM,OAAO,aAAc,SAAQ,KAAK;IACpC,YACI,OAAe,EACN,IAAkB,EAClB,IAAa;QAEtB,KAAK,CAAC,OAAO,CAAC,CAAC;oBAHN,IAAI;oBACJ,IAAI;QAGb,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAChC,CAAC;CACJ;AA6BD;;;;GAIG;AACH,MAAM,OAAO,YAAY;IAkBrB,YAA+B,OAA4B;QAA5B,YAAO,GAAP,OAAO,CAAqB;QAjB3D,oHAAoH;QAC3G,WAAM,GAAa,IAAI,KAAK,CAAC,EAAc,EAAE;YAClD,GAAG,EACC,CAAC,OAAO,EAAE,MAAc,EAAE,EAAE,CAC5B,CAAC,GAAG,MAAiB,EAAE,EAAE,CACrB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;SACpC,CAAC,CAAC;QAGO,WAAM,GAAG,KAAK,CAAC;QACf,aAAQ,GAAG,CAAC,CAAC;QAEb,WAAM,GAAG,CAAC,CAAC;QACF,YAAO,GAAG,IAAI,GAAG,EAAuB,CAAC;QACzC,mBAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC3C,kBAAa,GAAG,IAAI,GAAG,EAAgB,CAAC;IAEG,CAAC;IAE/D,2GAA2G;IAC3G,OAAO;QACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,KAAK;;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAClC,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,QAAQ,CAAC,QAAwB;QAC7B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,QAAsB;QACzB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,kGAAkG;IACxF,IAAI,CAAC,OAAoB,EAAE,MAA+B;QAChE,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACtC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;YACjB,MAAM,GAAG,IAAI,CAAC;YACd,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;YAClB,OAAO,aAAP,OAAO,uBAAP,OAAO,EAAI,CAAC;YACZ,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACxC,QAAQ,EAAE,CAAC;YACf,CAAC;QACL,CAAC,CAAC;QACF,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE;YAClB,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,aAAa,CAAC,qBAAqB,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;YACxE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7B,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IAES,iBAAiB;QACvB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO;QACX,CAAC;QACD,MAAM,EAAE,gBAAgB,GAAG,GAAG,EAAE,mBAAmB,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,mBAAmB,CAAC,CAAC;QACrF,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAES,WAAW;QACjB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,sCAAsC,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAES,IAAI,CAAC,MAAc,EAAE,MAAiB;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,MAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YACxC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,4BAA4B,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;QACzB,+EAA+E;QAC/E,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC3B,OAAO,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACpD,MAAM,EAAE,CAAC;QACb,CAAC;QACD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,iBAAiB,IAAI,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACnI,CAAC,CAAC,CAAC;IACP,CAAC;IAES,OAAO,CAAC,IAAY;;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAe,CAAC;QAC/C,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG,iBAAiB,WAAW,EAAE,CAAC;YACrD,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAA6B,CAAC;YACvD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACzC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACrB,CAAC;YACD,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACpF,OAAO;QACX,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAY,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,OAAO;QACX,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAY,CAAC,CAAC;QAC1C,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,KAAK,CAAC,IAAI,0CAAE,IAAI,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,CAAC,CAAC;QAClF,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;CACJ"}
1
+ {"version":3,"file":"ta-connection.js","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { RpcExtensionUIRequest, TaCommandResult, TaEvent } from '@celljs/ta-protocol';
1
+ import type { RpcExtensionUIRequest, TaClientToolRequest, TaCommandResult, TaEvent } from '@celljs/ta-protocol';
2
2
  export type SessionMessage = TaCommandResult<'get_messages'>['messages'][number];
3
3
  export interface ToolRun {
4
4
  toolName: string;
@@ -6,6 +6,21 @@ export interface ToolRun {
6
6
  /** The latest partial result while it runs, then the result. */
7
7
  result?: unknown;
8
8
  status: 'running' | 'done' | 'error';
9
+ /** Set for a call another tool made, such as a codemode script. */
10
+ parentToolCallId?: string;
11
+ }
12
+ /** A message of `notify`. */
13
+ export interface Notice {
14
+ id: string;
15
+ message: string;
16
+ type: 'info' | 'warning' | 'error';
17
+ }
18
+ /** pi retries a failed request of the model by itself: `auto_retry_start`. */
19
+ export interface RetryState {
20
+ attempt: number;
21
+ maxAttempts: number;
22
+ delayMs: number;
23
+ errorMessage: string;
9
24
  }
10
25
  /** What a UI shows of a session. */
11
26
  export interface SessionState {
@@ -16,9 +31,19 @@ export interface SessionState {
16
31
  tools: Record<string, ToolRun>;
17
32
  /** Dialogs waiting for an answer. */
18
33
  pendingUi: RpcExtensionUIRequest[];
34
+ /** Calls of client tools waiting for a result. */
35
+ pendingClientTools: TaClientToolRequest[];
36
+ /** The latest messages of `notify`, oldest first. */
37
+ notices: Notice[];
19
38
  /** What extensions show with `setStatus`. */
20
39
  status: Record<string, string>;
21
40
  closed: boolean;
41
+ /** The index in `messages` where the run of now starts: unknown for a run that started before this client attached. */
42
+ runStart?: number;
43
+ /** pi compacts the conversation, for this reason. */
44
+ compacting?: 'manual' | 'threshold' | 'overflow';
45
+ /** pi waits to retry a failed request of the model. */
46
+ retry?: RetryState;
22
47
  }
23
48
  export declare namespace SessionReducer {
24
49
  function initial(): SessionState;
@@ -1 +1 @@
1
- {"version":3,"file":"session-reducer.d.ts","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE3F,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjF,MAAM,WAAW,OAAO;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,gEAAgE;IAChE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;CACxC;AAED,oCAAoC;AACpC,MAAM,WAAW,YAAY;IACzB,0EAA0E;IAC1E,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,uBAAuB;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,qCAAqC;IACrC,SAAS,EAAE,qBAAqB,EAAE,CAAC;IACnC,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC;CACnB;AASD,yBAAiB,cAAc,CAAC;IAG5B,SAAgB,OAAO,IAAI,YAAY,CAEtC;IAED,yFAAyF;IACzF,SAAgB,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CA2BxE;CAqDJ"}
1
+ {"version":3,"file":"session-reducer.d.ts","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEhH,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjF,MAAM,WAAW,OAAO;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,gEAAgE;IAChE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IACrC,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,6BAA6B;AAC7B,MAAM,WAAW,MAAM;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACtC;AAED,8EAA8E;AAC9E,MAAM,WAAW,UAAU;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,oCAAoC;AACpC,MAAM,WAAW,YAAY;IACzB,0EAA0E;IAC1E,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,uBAAuB;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,qCAAqC;IACrC,SAAS,EAAE,qBAAqB,EAAE,CAAC;IACnC,kDAAkD;IAClD,kBAAkB,EAAE,mBAAmB,EAAE,CAAC;IAC1C,qDAAqD;IACrD,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,uHAAuH;IACvH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,UAAU,CAAC,EAAE,QAAQ,GAAG,WAAW,GAAG,UAAU,CAAC;IACjD,uDAAuD;IACvD,KAAK,CAAC,EAAE,UAAU,CAAC;CACtB;AAUD,yBAAiB,cAAc,CAAC;IAI5B,SAAgB,OAAO,IAAI,YAAY,CAEtC;IAED,yFAAyF;IACzF,SAAgB,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,GAAG,YAAY,CA+CxE;CAmEJ"}
@@ -4,25 +4,32 @@ exports.SessionReducer = void 0;
4
4
  var SessionReducer;
5
5
  (function (SessionReducer) {
6
6
  const DIALOGS = new Set(['select', 'confirm', 'input', 'editor']);
7
+ const MAX_NOTICES = 20;
7
8
  function initial() {
8
- return { working: false, messages: [], tools: {}, pendingUi: [], status: {}, closed: false };
9
+ return { working: false, messages: [], tools: {}, pendingUi: [], pendingClientTools: [], notices: [], status: {}, closed: false };
9
10
  }
10
11
  SessionReducer.initial = initial;
11
12
  /** The next state; the previous one stays valid, so that UIs can compare by identity. */
12
13
  function reduce(state, event) {
13
14
  switch (event.type) {
14
15
  case 'agent_start':
15
- return { ...state, working: true };
16
+ return { ...state, working: true, runStart: state.messages.length };
16
17
  case 'agent_settled':
17
- return { ...state, working: false };
18
+ return { ...state, working: false, retry: undefined };
18
19
  case 'message_start':
19
20
  return { ...state, messages: [...state.messages, event.message] };
20
- case 'message_update':
21
- return withLastMessage(state, message => applyDelta(message, event.assistantMessageEvent));
21
+ case 'message_update': {
22
+ // The usage so far: some APIs count while they stream, others only at the end.
23
+ const { usage } = event;
24
+ return withLastMessage(state, message => withUsage(applyDelta(message, event.assistantMessageEvent), usage));
25
+ }
22
26
  case 'message_end':
23
27
  return withLastMessage(state, () => event.message);
24
- case 'tool_execution_start':
25
- return withTool(state, event.toolCallId, { toolName: event.toolName, args: event.args, status: 'running' });
28
+ case 'tool_execution_start': {
29
+ const { parentToolCallId } = event;
30
+ const run = { toolName: event.toolName, args: event.args, status: 'running' };
31
+ return withTool(state, event.toolCallId, parentToolCallId ? { ...run, parentToolCallId } : run);
32
+ }
26
33
  case 'tool_execution_update':
27
34
  return withTool(state, event.toolCallId, { ...state.tools[event.toolCallId], result: event.partialResult });
28
35
  case 'tool_execution_end':
@@ -31,8 +38,22 @@ var SessionReducer;
31
38
  return applyUiRequest(state, event);
32
39
  case 'ui_request_resolved':
33
40
  return { ...state, pendingUi: state.pendingUi.filter(request => request.id !== event.id) };
41
+ case 'client_tool_request':
42
+ return { ...state, pendingClientTools: [...state.pendingClientTools, event] };
43
+ case 'client_tool_resolved':
44
+ return { ...state, pendingClientTools: state.pendingClientTools.filter(request => request.id !== event.id) };
45
+ case 'compaction_start':
46
+ return { ...state, compacting: event.reason };
47
+ case 'compaction_end':
48
+ return { ...state, compacting: undefined };
49
+ case 'auto_retry_start': {
50
+ const { attempt, maxAttempts, delayMs, errorMessage } = event;
51
+ return { ...state, retry: { attempt, maxAttempts, delayMs, errorMessage } };
52
+ }
53
+ case 'auto_retry_end':
54
+ return { ...state, retry: undefined };
34
55
  case 'session_closed':
35
- return { ...state, closed: true, working: false, pendingUi: [] };
56
+ return { ...state, closed: true, working: false, pendingUi: [], pendingClientTools: [] };
36
57
  default:
37
58
  return state;
38
59
  }
@@ -45,13 +66,24 @@ var SessionReducer;
45
66
  const last = state.messages.length - 1;
46
67
  return { ...state, messages: [...state.messages.slice(0, last), update(state.messages[last])] };
47
68
  }
69
+ function withUsage(message, usage) {
70
+ if (!usage || message.role !== 'assistant' || message.usage === usage) {
71
+ return message;
72
+ }
73
+ return { ...message, usage };
74
+ }
48
75
  function withTool(state, toolCallId, run) {
49
76
  return { ...state, tools: { ...state.tools, [toolCallId]: run } };
50
77
  }
51
78
  function applyUiRequest(state, request) {
79
+ var _a;
52
80
  if (DIALOGS.has(request.method)) {
53
81
  return { ...state, pendingUi: [...state.pendingUi, request] };
54
82
  }
83
+ if (request.method === 'notify') {
84
+ const notice = { id: request.id, message: request.message, type: (_a = request.notifyType) !== null && _a !== void 0 ? _a : 'info' };
85
+ return { ...state, notices: [...state.notices, notice].slice(-MAX_NOTICES) };
86
+ }
55
87
  if (request.method === 'setStatus') {
56
88
  const { [request.statusKey]: _old, ...status } = state.status;
57
89
  return { ...state, status: request.statusText === undefined ? status : { ...status, [request.statusKey]: request.statusText } };
@@ -70,7 +102,7 @@ var SessionReducer;
70
102
  return { ...message, content };
71
103
  }
72
104
  function nextBlock(block, delta) {
73
- var _a, _b;
105
+ var _a, _b, _c;
74
106
  switch (delta.type) {
75
107
  case 'text_start':
76
108
  return { type: 'text', text: '' };
@@ -82,6 +114,9 @@ var SessionReducer;
82
114
  return block && { ...block, text: `${(_a = block.text) !== null && _a !== void 0 ? _a : ''}${delta.delta}` };
83
115
  case 'thinking_delta':
84
116
  return block && { ...block, thinking: `${(_b = block.thinking) !== null && _b !== void 0 ? _b : ''}${delta.delta}` };
117
+ case 'toolcall_delta':
118
+ // The arguments as they come, JSON not yet whole: what the model has written so far.
119
+ return block && { ...block, partialJson: `${(_c = block.partialJson) !== null && _c !== void 0 ? _c : ''}${delta.delta}` };
85
120
  default:
86
121
  return undefined;
87
122
  }
@@ -1 +1 @@
1
- {"version":3,"file":"session-reducer.js","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session-reducer.js","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":"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"}
@@ -33,6 +33,27 @@ const assistant = (content = []) => ({ role: 'assistant', content });
33
33
  { type: 'toolCall', id: 'c1', name: 'bash', arguments: {} },
34
34
  ]);
35
35
  });
36
+ (0, bun_test_1.it)('takes the usage of a streaming message, and the arguments of a tool call as they come', () => {
37
+ const usage = { input: 10, output: 3 };
38
+ const state = run([
39
+ { type: 'message_start', message: assistant() },
40
+ { type: 'message_update', usage, assistantMessageEvent: { type: 'toolcall_start', contentIndex: 0, id: 'c1', toolName: 'bash' } },
41
+ { type: 'message_update', usage, assistantMessageEvent: { type: 'toolcall_delta', contentIndex: 0, delta: '{"comm' } },
42
+ { type: 'message_update', usage, assistantMessageEvent: { type: 'toolcall_delta', contentIndex: 0, delta: 'and":"ls"}' } },
43
+ ]);
44
+ (0, bun_test_1.expect)(state.messages[0]).toMatchObject({ usage, content: [{ type: 'toolCall', id: 'c1', partialJson: '{"command":"ls"}' }] });
45
+ });
46
+ (0, bun_test_1.it)('knows where a run starts, and when pi compacts or retries', () => {
47
+ const started = run([{ type: 'message_start', message: { role: 'user', content: 'a' } }, { type: 'agent_start' }]);
48
+ (0, bun_test_1.expect)(started.runStart).toBe(1);
49
+ const compacting = run([{ type: 'compaction_start', reason: 'threshold' }], started);
50
+ (0, bun_test_1.expect)(compacting.compacting).toBe('threshold');
51
+ (0, bun_test_1.expect)(run([{ type: 'compaction_end', reason: 'threshold', aborted: false, willRetry: false }], compacting).compacting).toBeUndefined();
52
+ const retrying = run([{ type: 'auto_retry_start', attempt: 1, maxAttempts: 3, delayMs: 2000, errorMessage: 'overloaded' }], started);
53
+ (0, bun_test_1.expect)(retrying.retry).toEqual({ attempt: 1, maxAttempts: 3, delayMs: 2000, errorMessage: 'overloaded' });
54
+ (0, bun_test_1.expect)(run([{ type: 'auto_retry_end', success: true, attempt: 1 }], retrying).retry).toBeUndefined();
55
+ (0, bun_test_1.expect)(run([{ type: 'agent_settled', aborted: false }], retrying).retry).toBeUndefined();
56
+ });
36
57
  (0, bun_test_1.it)('follows a tool run', () => {
37
58
  const started = run([{ type: 'tool_execution_start', toolCallId: 'c1', toolName: 'bash', args: { command: 'ls' } }]);
38
59
  (0, bun_test_1.expect)(started.tools.c1).toEqual({ toolName: 'bash', args: { command: 'ls' }, status: 'running' });
@@ -47,6 +68,22 @@ const assistant = (content = []) => ({ role: 'assistant', content });
47
68
  (0, bun_test_1.expect)(waiting.pendingUi).toEqual([dialog]);
48
69
  (0, bun_test_1.expect)(run([{ type: 'ui_request_resolved', id: 'u1' }], waiting).pendingUi).toEqual([]);
49
70
  });
71
+ (0, bun_test_1.it)('tells nested tool calls by their parent', () => {
72
+ const state = run([{ type: 'tool_execution_start', toolCallId: 'n1', toolName: 'read', args: {}, parentToolCallId: 'c1' }]);
73
+ (0, bun_test_1.expect)(state.tools.n1.parentToolCallId).toBe('c1');
74
+ });
75
+ (0, bun_test_1.it)('tracks calls of client tools until they are resolved', () => {
76
+ const request = { type: 'client_tool_request', id: 't1', toolName: 'pick', input: {} };
77
+ const waiting = run([request]);
78
+ (0, bun_test_1.expect)(waiting.pendingClientTools).toEqual([request]);
79
+ (0, bun_test_1.expect)(run([{ type: 'client_tool_resolved', id: 't1' }], waiting).pendingClientTools).toEqual([]);
80
+ });
81
+ (0, bun_test_1.it)('keeps the latest notices', () => {
82
+ const notices = Array.from({ length: 25 }, (_, i) => ({ type: 'extension_ui_request', id: `n${i}`, method: 'notify', message: `m${i}` }));
83
+ const state = run(notices);
84
+ (0, bun_test_1.expect)(state.notices).toHaveLength(20);
85
+ (0, bun_test_1.expect)(state.notices.at(-1)).toEqual({ id: 'n24', message: 'm24', type: 'info' });
86
+ });
50
87
  (0, bun_test_1.it)('keeps what extensions set with setStatus', () => {
51
88
  const set = run([{ type: 'extension_ui_request', id: 'u', method: 'setStatus', statusKey: 'k', statusText: 'on' }]);
52
89
  (0, bun_test_1.expect)(set.status).toEqual({ k: 'on' });
@@ -1 +1 @@
1
- {"version":3,"file":"session-reducer.spec.js","sourceRoot":"","sources":["../../src/common/session-reducer.spec.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAEhD,uDAAsE;AAEtE,MAAM,GAAG,GAAG,CAAC,MAAiB,EAAE,IAAI,GAAiB,gCAAc,CAAC,OAAO,EAAE,EAAE,EAAE,CAAE,MAAoB,CAAC,MAAM,CAAC,gCAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC5I,MAAM,SAAS,GAAG,CAAC,OAAO,GAAc,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;AAEhF,IAAA,mBAAQ,EAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,IAAA,aAAE,EAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjF,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,iEAAiE,EAAE,GAAG,EAAE;QACvE,MAAM,SAAS,GAAG,GAAG,CAAC;YAClB,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;YAC/C,EAAE,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE;YAC1F,EAAE,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACxG,EAAE,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;SAC1G,CAAC,CAAC;QACH,IAAA,iBAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAA2B,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC5G,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5D,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAU,CAAC,CAAC;IACzG,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,sDAAsD,EAAE,GAAG,EAAE;QAC5D,MAAM,KAAK,GAAG,GAAG,CAAC;YACd,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;YAC/C,EAAE,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE;YAC9F,EAAE,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC3G,EAAE,IAAI,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;SAC7H,CAAC,CAAC;QACH,IAAA,iBAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAA2B,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YACjE,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE;YACpC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE;SACrD,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,oBAAoB,EAAE,GAAG,EAAE;QAC1B,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QACrH,IAAA,iBAAM,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACnG,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QACxG,IAAA,iBAAM,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAC3G,IAAA,iBAAM,EAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,iFAAiF,EAAE,GAAG,EAAE;QACvF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;QACvG,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC3G,IAAA,iBAAM,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAU,CAAC,CAAC;QACrD,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,0CAA0C,EAAE,GAAG,EAAE;QAChD,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACpH,IAAA,iBAAM,EAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACxC,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1H,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,sDAAsD,EAAE,GAAG,EAAE;QAC5D,MAAM,KAAK,GAAG,gCAAc,CAAC,OAAO,EAAE,CAAC;QACvC,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,wBAAwB,EAAE,GAAG,EAAE;QAC9B,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACvH,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"session-reducer.spec.js","sourceRoot":"","sources":["../../src/common/session-reducer.spec.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,20 @@
1
- import type { RpcExtensionUIResponse, TaAttachResult, TaEventEnvelope, TaPromptInput, TaPromptReceipt, TaSessionInfo } from '@celljs/ta-protocol';
1
+ import type { RpcExtensionUIResponse, TaAttachResult, TaClientToolDefinition, TaClientToolRequest, TaClientToolResult, TaEvent, TaEventEnvelope, TaPromptInput, TaPromptReceipt, TaSessionInfo } from '@celljs/ta-protocol';
2
2
  import { type SessionState } from './session-reducer';
3
3
  import type { TaConnection } from './ta-connection';
4
4
  type Listener = (state: SessionState) => void;
5
+ /**
6
+ * A tool this client runs. Open the session with its `definition` in `clientTools`, and give the tool
7
+ * to the store, which runs each call and sends the result. Its output is what the model reads; a
8
+ * thrown error becomes a failed call.
9
+ */
10
+ export interface ClientTool {
11
+ definition: TaClientToolDefinition;
12
+ run(input: unknown, request: TaClientToolRequest): Promise<string> | string;
13
+ }
14
+ export interface SessionStoreOptions {
15
+ /** The tools of the session this client runs. Other clients may run them too: the first result counts. */
16
+ clientTools?: ClientTool[];
17
+ }
5
18
  /**
6
19
  * The state of one open session on a client: for any UI to render and subscribe to. It catches up by
7
20
  * itself after a reconnect, from the events it missed or, if those are gone, from the session.
@@ -12,14 +25,22 @@ export declare class SessionStore {
12
25
  protected current: SessionState;
13
26
  protected lastSeq?: number;
14
27
  protected readonly listeners: Set<Listener>;
28
+ protected readonly eventListeners: Set<(event: TaEvent) => void>;
15
29
  protected readonly stop: (() => void)[];
16
- constructor(connection: TaConnection, sessionId: string);
30
+ protected readonly clientTools: Map<string, ClientTool>;
31
+ /** Calls of client tools this store is running or answering now, by id. */
32
+ protected readonly running: Set<string>;
33
+ /** Results not yet taken by the server, by call id. */
34
+ protected readonly results: Map<string, TaClientToolResult>;
35
+ constructor(connection: TaConnection, sessionId: string, options?: SessionStoreOptions);
17
36
  get state(): SessionState;
18
37
  /** Starts following the session. */
19
38
  attach(): Promise<TaSessionInfo>;
20
39
  /** Stops following it. The session goes on. */
21
40
  detach(): Promise<void>;
22
41
  subscribe(listener: Listener): () => void;
42
+ /** Each new event of the session, once the state has taken it in. */
43
+ onEvent(listener: (event: TaEvent) => void): () => void;
23
44
  /** Sends a message with a new id; a resend after a lost connection must reuse the id. */
24
45
  prompt(message: string, input?: Partial<TaPromptInput>): Promise<TaPromptReceipt>;
25
46
  respondUi(response: RpcExtensionUIResponse): Promise<boolean>;
@@ -27,6 +48,10 @@ export declare class SessionStore {
27
48
  protected reload(): Promise<void>;
28
49
  protected apply(events: TaEventEnvelope[]): void;
29
50
  protected update(state: SessionState): void;
51
+ protected runClientTools(state: SessionState): void;
52
+ /** Runs a call once: a result that could not be sent is sent again after a reconnect, not made again. */
53
+ protected answer(tool: ClientTool, request: TaClientToolRequest): Promise<void>;
54
+ protected run(tool: ClientTool, request: TaClientToolRequest): Promise<TaClientToolResult>;
30
55
  }
31
56
  export {};
32
57
  //# sourceMappingURL=session-store.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/common/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClJ,OAAO,EAAkB,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,KAAK,QAAQ,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC;AAE9C;;;GAGG;AACH,qBAAa,YAAY;IAOjB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,YAAY;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM;IAP9B,SAAS,CAAC,OAAO,eAA4B;IAC7C,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,QAAQ,CAAC,SAAS,gBAAuB;IACnD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAM;IAE7C,YACuB,UAAU,EAAE,YAAY,EAClC,SAAS,EAAE,MAAM,EAC1B;IAEJ,IAAI,KAAK,IAAI,YAAY,CAExB;IAED,oCAAoC;IAC9B,MAAM,IAAI,OAAO,CAAC,aAAa,CAAC,CAMrC;IAED,+CAA+C;IACzC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAK5B;IAED,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,IAAI,CAGxC;IAED,yFAAyF;IACzF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,OAAO,CAAC,aAAa,CAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAEpF;IAED,SAAS,CAAC,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,OAAO,CAAC,CAE5D;IAED,UAAgB,WAAW,IAAI,OAAO,CAAC,cAAc,CAAC,CASrD;IAED,UAAgB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAGtC;IAED,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAgB/C;IAED,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAO1C;CACJ"}
1
+ {"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/common/session-store.ts"],"names":[],"mappings":"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"}