@celljs/ta-client 4.6.1 → 4.8.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.
- package/README.en.md +33 -0
- package/README.md +1 -1
- package/esm/common/session-reducer.d.ts +11 -0
- package/esm/common/session-reducer.js +25 -3
- package/esm/common/session-reducer.js.map +1 -1
- package/esm/common/session-store.js +11 -1
- package/esm/common/session-store.js.map +1 -1
- package/esm/common/ta-connection.d.ts +6 -1
- package/esm/common/ta-connection.js +19 -4
- package/esm/common/ta-connection.js.map +1 -1
- package/lib/common/session-reducer.d.ts +11 -0
- package/lib/common/session-reducer.d.ts.map +1 -1
- package/lib/common/session-reducer.js +25 -3
- package/lib/common/session-reducer.js.map +1 -1
- package/lib/common/session-reducer.spec.js +22 -0
- package/lib/common/session-reducer.spec.js.map +1 -1
- package/lib/common/session-store.d.ts.map +1 -1
- package/lib/common/session-store.js +11 -1
- package/lib/common/session-store.js.map +1 -1
- package/lib/common/ta-connection.d.ts +6 -1
- package/lib/common/ta-connection.d.ts.map +1 -1
- package/lib/common/ta-connection.js +18 -3
- package/lib/common/ta-connection.js.map +1 -1
- package/package.json +2 -2
- package/src/common/session-reducer.spec.ts +24 -0
- package/src/common/session-reducer.ts +35 -3
- package/src/common/session-store.ts +11 -1
- package/src/common/ta-connection.ts +20 -0
package/README.en.md
ADDED
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
# Cell - Ta Client
|
|
2
|
+
|
|
3
|
+
The client for `ta serve`: depends only on platform-native `WebSocket`, and works in browsers, Electron, mobile apps, and Node.js >= 22.4.
|
|
4
|
+
|
|
5
|
+
```ts
|
|
6
|
+
import { SessionStore, TaConnection } from '@celljs/ta-client';
|
|
7
|
+
|
|
8
|
+
const connection = new TaConnection({ url, token }); // from ~/.ta/agent/serve.json
|
|
9
|
+
await connection.connect();
|
|
10
|
+
const { sessionId } = await connection.server.openSession({ cwd: '/repo' });
|
|
11
|
+
|
|
12
|
+
const store = new SessionStore(connection, sessionId);
|
|
13
|
+
store.subscribe(state => render(state)); // notified once per batch of events
|
|
14
|
+
await store.attach();
|
|
15
|
+
await store.prompt('Fix the failing tests');
|
|
16
|
+
```
|
|
17
|
+
|
|
18
|
+
- `TaConnection`: auto-reconnects after disconnect using exponential backoff. `onReconnecting(delayMs, attempt)` notifies you before each wait, and `reconnect()` skips the wait and retries immediately. `connection.server` (sessions), `workspace`, `terminals`, `settings`, `packages`, `auth` (login to model services, subscribe to events with `onAuthEvent`), and `relay` (paired devices) are typed proxies for ta serve's services, all sharing one connection. The `createSocket` option lets you use a different transport, like `RelaySocket` through Relay ([@celljs/ta-relay](../ta-relay/README.md)). Calls during disconnection fail immediately (`TaRemoteError`, `code` is `CELL_TA_CONNECTION_LOST`) without queuing; whether to retry is up to the caller (reuse `clientMessageId` when retrying). Connections that drop re-establish themselves; operations from before the drop complete with the previous code if the server still has them.
|
|
19
|
+
- `SessionStore`: the client-side state for one session (messages, tool runs, pending dialogs, extension status bars). After reconnect, it resends missed events by `seq`. If it can't catch up (a `gap`), it auto-syncs with `getMessages`.
|
|
20
|
+
- Client tools: the model can call tools run by the client (e.g., read clipboard, let the user pick something in the UI). Declare them when opening a session; `SessionStore` runs them and returns the results:
|
|
21
|
+
|
|
22
|
+
```ts
|
|
23
|
+
const pickColor: ClientTool = {
|
|
24
|
+
definition: { name: 'pick_color', description: 'Ask the user to pick a color', parameters: { type: 'object', properties: {} } },
|
|
25
|
+
run: async () => await showColorPicker(), // text returned to model; errors mean tool failure
|
|
26
|
+
};
|
|
27
|
+
const { sessionId } = await connection.server.openSession({ cwd, clientTools: [pickColor.definition] });
|
|
28
|
+
const store = new SessionStore(connection, sessionId, { clientTools: [pickColor] });
|
|
29
|
+
```
|
|
30
|
+
|
|
31
|
+
Call requests broadcast to all connected clients; the first result wins (same as dialogs). Each call runs once per client, and after disconnect, resends the already-calculated result instead of running again. If `run` is aborted or the session closes, the call ends as failed. The same client tools work in codemode scripts using `tools.pick_color()`.
|
|
32
|
+
- `openSession`'s `appendSystemPrompt` appends a system prompt line to the session (like pi's `--append-system-prompt`), allowing clients to give the Agent a role.
|
|
33
|
+
- `SessionReducer`: a pure function `(state, event) => state`, never mutating old state, so UIs can compare by reference.
|
package/README.md
CHANGED
|
@@ -15,7 +15,7 @@ await store.attach();
|
|
|
15
15
|
await store.prompt('修复失败的测试');
|
|
16
16
|
```
|
|
17
17
|
|
|
18
|
-
- `TaConnection`:断线后自动重连(指数退避);`onReconnecting(delayMs, attempt)` 在每次等待前通知,`reconnect()` 跳过等待立即重试。`connection.server`(会话)、`workspace`、`terminals`、`settings`、`packages`
|
|
18
|
+
- `TaConnection`:断线后自动重连(指数退避);`onReconnecting(delayMs, attempt)` 在每次等待前通知,`reconnect()` 跳过等待立即重试。`connection.server`(会话)、`workspace`、`terminals`、`settings`、`packages`、`auth`(登录模型服务,事件用 `onAuthEvent` 订阅)、`relay`(配对设备)是 ta serve 各服务的带类型代理,共用这一条连接。`createSocket` 选项可以换成别的传输,例如经 Relay 的 `RelaySocket`([@celljs/ta-relay](../ta-relay/README.md))。断线期间的调用直接失败(`TaRemoteError`,`code` 为 `CELL_TA_CONNECTION_LOST`),不排队,是否重发由调用方决定(重发请复用 `clientMessageId`)。
|
|
19
19
|
- `SessionStore`:一个会话在客户端的状态(消息、工具执行、待回答的对话框、扩展状态栏)。重连后按 `seq` 补发错过的事件;补不上时(`gap`)自动用 `getMessages` 重新同步。
|
|
20
20
|
- 客户端工具:模型可以调用由客户端执行的工具(例如读剪贴板、让用户在界面里选择)。打开会话时声明,`SessionStore` 负责执行并回传结果:
|
|
21
21
|
|
|
@@ -23,6 +23,10 @@ export interface RetryState {
|
|
|
23
23
|
errorMessage: string;
|
|
24
24
|
}
|
|
25
25
|
/** What a UI shows of a session. */
|
|
26
|
+
export interface SessionWidget {
|
|
27
|
+
lines: string[];
|
|
28
|
+
placement: 'aboveEditor' | 'belowEditor';
|
|
29
|
+
}
|
|
26
30
|
export interface SessionState {
|
|
27
31
|
/** The agent is working, from the start of a run until it has settled. */
|
|
28
32
|
working: boolean;
|
|
@@ -37,6 +41,13 @@ export interface SessionState {
|
|
|
37
41
|
notices: Notice[];
|
|
38
42
|
/** What extensions show with `setStatus`. */
|
|
39
43
|
status: Record<string, string>;
|
|
44
|
+
/** The lines extensions show with `setWidget`, by key, above the message box or below it. */
|
|
45
|
+
widgets: Record<string, SessionWidget>;
|
|
46
|
+
/** Text an extension put in the message box (`setEditorText`): a client takes it once, by its id. */
|
|
47
|
+
editorText?: {
|
|
48
|
+
id: string;
|
|
49
|
+
text: string;
|
|
50
|
+
};
|
|
40
51
|
closed: boolean;
|
|
41
52
|
/** The index in `messages` where the run of now starts: unknown for a run that started before this client attached. */
|
|
42
53
|
runStart?: number;
|
|
@@ -3,7 +3,7 @@ export var SessionReducer;
|
|
|
3
3
|
const DIALOGS = new Set(['select', 'confirm', 'input', 'editor']);
|
|
4
4
|
const MAX_NOTICES = 20;
|
|
5
5
|
function initial() {
|
|
6
|
-
return { working: false, messages: [], tools: {}, pendingUi: [], pendingClientTools: [], notices: [], status: {}, closed: false };
|
|
6
|
+
return { working: false, messages: [], tools: {}, pendingUi: [], pendingClientTools: [], notices: [], status: {}, widgets: {}, closed: false };
|
|
7
7
|
}
|
|
8
8
|
SessionReducer.initial = initial;
|
|
9
9
|
/** The next state; the previous one stays valid, so that UIs can compare by identity. */
|
|
@@ -49,6 +49,8 @@ export var SessionReducer;
|
|
|
49
49
|
}
|
|
50
50
|
case 'auto_retry_end':
|
|
51
51
|
return { ...state, retry: undefined };
|
|
52
|
+
case 'extension_error':
|
|
53
|
+
return withNotice(state, { id: crypto.randomUUID(), message: extensionError(event), type: 'error' });
|
|
52
54
|
case 'session_closed':
|
|
53
55
|
return { ...state, closed: true, working: false, pendingUi: [], pendingClientTools: [] };
|
|
54
56
|
default:
|
|
@@ -72,19 +74,39 @@ export var SessionReducer;
|
|
|
72
74
|
function withTool(state, toolCallId, run) {
|
|
73
75
|
return { ...state, tools: { ...state.tools, [toolCallId]: run } };
|
|
74
76
|
}
|
|
77
|
+
/** What failed, as the user knows it: a command by its name. */
|
|
78
|
+
function extensionError(event) {
|
|
79
|
+
const source = event.extensionPath.startsWith('command:') ? `/${event.extensionPath.slice('command:'.length)}` : event.extensionPath;
|
|
80
|
+
return `${source}: ${event.error}`;
|
|
81
|
+
}
|
|
82
|
+
function withNotice(state, notice) {
|
|
83
|
+
return { ...state, notices: [...state.notices, notice].slice(-MAX_NOTICES) };
|
|
84
|
+
}
|
|
75
85
|
function applyUiRequest(state, request) {
|
|
76
86
|
var _a;
|
|
87
|
+
var _b, _c;
|
|
77
88
|
if (DIALOGS.has(request.method)) {
|
|
78
89
|
return { ...state, pendingUi: [...state.pendingUi, request] };
|
|
79
90
|
}
|
|
80
91
|
if (request.method === 'notify') {
|
|
81
|
-
|
|
82
|
-
return { ...state, notices: [...state.notices, notice].slice(-MAX_NOTICES) };
|
|
92
|
+
return withNotice(state, { id: request.id, message: request.message, type: (_b = request.notifyType) !== null && _b !== void 0 ? _b : 'info' });
|
|
83
93
|
}
|
|
84
94
|
if (request.method === 'setStatus') {
|
|
85
95
|
const { [request.statusKey]: _old, ...status } = state.status;
|
|
86
96
|
return { ...state, status: request.statusText === undefined ? status : { ...status, [request.statusKey]: request.statusText } };
|
|
87
97
|
}
|
|
98
|
+
if (request.method === 'setWidget') {
|
|
99
|
+
const { [request.widgetKey]: _old, ...widgets } = state.widgets;
|
|
100
|
+
return {
|
|
101
|
+
...state,
|
|
102
|
+
widgets: ((_a = request.widgetLines) === null || _a === void 0 ? void 0 : _a.length)
|
|
103
|
+
? { ...widgets, [request.widgetKey]: { lines: request.widgetLines, placement: (_c = request.widgetPlacement) !== null && _c !== void 0 ? _c : 'aboveEditor' } }
|
|
104
|
+
: widgets,
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
if (request.method === 'set_editor_text') {
|
|
108
|
+
return { ...state, editorText: { id: request.id, text: request.text } };
|
|
109
|
+
}
|
|
88
110
|
return state;
|
|
89
111
|
}
|
|
90
112
|
function applyDelta(message, delta) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-reducer.js","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-reducer.js","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,17 @@ export class SessionStore {
|
|
|
56
56
|
this.lastSeq = result.lastSeq;
|
|
57
57
|
}
|
|
58
58
|
this.apply(result.events);
|
|
59
|
-
|
|
59
|
+
let state = {
|
|
60
|
+
...this.current,
|
|
61
|
+
pendingUi: result.pendingUi,
|
|
62
|
+
pendingClientTools: result.pendingClientTools,
|
|
63
|
+
working: result.info.isStreaming,
|
|
64
|
+
};
|
|
65
|
+
if (result.shownUi) {
|
|
66
|
+
// What the extensions show now, whatever events were missed.
|
|
67
|
+
state = result.shownUi.reduce(SessionReducer.reduce, { ...state, status: {}, widgets: {} });
|
|
68
|
+
}
|
|
69
|
+
this.update(state);
|
|
60
70
|
return result;
|
|
61
71
|
}
|
|
62
72
|
async reload() {
|
|
@@ -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 TaAuthEvent, type TaAuthServer, TaErrorCode, type TaEventEnvelope, type TaPackageServer, type TaRelayServer, type TaServer, type TaSettingsServer, type TaTerminalServer, type TaWorkspaceServer } from '@celljs/ta-protocol';
|
|
1
|
+
import { type TaAuthEvent, type TaAuthServer, TaErrorCode, type TaEventEnvelope, type TaPackageServer, type TaRelayServer, type TaRemoteEvent, type TaRemoteServer, 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;
|
|
@@ -40,6 +40,7 @@ type EventsListener = (events: TaEventEnvelope[]) => void;
|
|
|
40
40
|
type TerminalListener = (terminalId: string, data: string, exitCode?: number) => void;
|
|
41
41
|
type ExtensionDataListener = (name: string, keys: string[], cwd?: string) => void;
|
|
42
42
|
type AuthEventListener = (loginId: string, event: TaAuthEvent) => void;
|
|
43
|
+
type RemoteEventListener = (event: TaRemoteEvent) => void;
|
|
43
44
|
type OpenListener = () => void;
|
|
44
45
|
type CloseListener = () => void;
|
|
45
46
|
type ReconnectingListener = (delayMs: number, attempt: number) => void;
|
|
@@ -60,6 +61,7 @@ export declare class TaConnection {
|
|
|
60
61
|
readonly packages: TaPackageServer;
|
|
61
62
|
readonly auth: TaAuthServer;
|
|
62
63
|
readonly relay: TaRelayServer;
|
|
64
|
+
readonly remote: TaRemoteServer;
|
|
63
65
|
protected socket?: TaSocket;
|
|
64
66
|
protected closed: boolean;
|
|
65
67
|
protected attempts: number;
|
|
@@ -70,6 +72,7 @@ export declare class TaConnection {
|
|
|
70
72
|
protected readonly terminalListeners: Set<TerminalListener>;
|
|
71
73
|
protected readonly extensionDataListeners: Set<ExtensionDataListener>;
|
|
72
74
|
protected readonly authListeners: Set<AuthEventListener>;
|
|
75
|
+
protected readonly remoteListeners: Set<RemoteEventListener>;
|
|
73
76
|
protected readonly openListeners: Set<OpenListener>;
|
|
74
77
|
protected readonly closeListeners: Set<CloseListener>;
|
|
75
78
|
protected readonly reconnectingListeners: Set<ReconnectingListener>;
|
|
@@ -84,6 +87,8 @@ export declare class TaConnection {
|
|
|
84
87
|
onExtensionData(listener: ExtensionDataListener): () => void;
|
|
85
88
|
/** What happens during the sign-ins of this connection (TaAuthServer.login). */
|
|
86
89
|
onAuthEvent(listener: AuthEventListener): () => void;
|
|
90
|
+
/** What happens with the remote machines, once this connection called TaRemoteServer.watch. */
|
|
91
|
+
onRemoteEvent(listener: RemoteEventListener): () => void;
|
|
87
92
|
onOpen(listener: OpenListener): () => void;
|
|
88
93
|
/** Runs each time an open connection is lost; it reconnects unless closed. */
|
|
89
94
|
onClose(listener: CloseListener): () => void;
|
|
@@ -1,4 +1,4 @@
|
|
|
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';
|
|
1
|
+
import { TA_AUTH_SERVICE, TA_CLIENT_SERVICE, TA_PACKAGE_SERVICE, TA_RELAY_SERVICE, TA_REMOTE_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) {
|
|
@@ -26,6 +26,7 @@ export class TaConnection {
|
|
|
26
26
|
this.packages = this.service(TA_PACKAGE_SERVICE);
|
|
27
27
|
this.auth = this.service(TA_AUTH_SERVICE);
|
|
28
28
|
this.relay = this.service(TA_RELAY_SERVICE);
|
|
29
|
+
this.remote = this.service(TA_REMOTE_SERVICE);
|
|
29
30
|
this.closed = false;
|
|
30
31
|
this.attempts = 0;
|
|
31
32
|
this.nextId = 0;
|
|
@@ -34,6 +35,7 @@ export class TaConnection {
|
|
|
34
35
|
this.terminalListeners = new Set();
|
|
35
36
|
this.extensionDataListeners = new Set();
|
|
36
37
|
this.authListeners = new Set();
|
|
38
|
+
this.remoteListeners = new Set();
|
|
37
39
|
this.openListeners = new Set();
|
|
38
40
|
this.closeListeners = new Set();
|
|
39
41
|
this.reconnectingListeners = new Set();
|
|
@@ -67,6 +69,11 @@ export class TaConnection {
|
|
|
67
69
|
this.authListeners.add(listener);
|
|
68
70
|
return () => this.authListeners.delete(listener);
|
|
69
71
|
}
|
|
72
|
+
/** What happens with the remote machines, once this connection called TaRemoteServer.watch. */
|
|
73
|
+
onRemoteEvent(listener) {
|
|
74
|
+
this.remoteListeners.add(listener);
|
|
75
|
+
return () => this.remoteListeners.delete(listener);
|
|
76
|
+
}
|
|
70
77
|
onOpen(listener) {
|
|
71
78
|
this.openListeners.add(listener);
|
|
72
79
|
return () => this.openListeners.delete(listener);
|
|
@@ -164,7 +171,7 @@ export class TaConnection {
|
|
|
164
171
|
});
|
|
165
172
|
}
|
|
166
173
|
receive(text) {
|
|
167
|
-
var _a, _b, _c, _d, _e;
|
|
174
|
+
var _a, _b, _c, _d, _e, _f;
|
|
168
175
|
const message = JSON.parse(text);
|
|
169
176
|
if (message.method === `${TA_CLIENT_SERVICE}/onEvents`) {
|
|
170
177
|
const [events] = message.params;
|
|
@@ -191,12 +198,20 @@ export class TaConnection {
|
|
|
191
198
|
(_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
192
199
|
return;
|
|
193
200
|
}
|
|
201
|
+
if (message.method === `${TA_CLIENT_SERVICE}/onRemoteEvent`) {
|
|
202
|
+
const [event] = message.params;
|
|
203
|
+
for (const listener of this.remoteListeners) {
|
|
204
|
+
listener(event);
|
|
205
|
+
}
|
|
206
|
+
(_d = this.socket) === null || _d === void 0 ? void 0 : _d.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
194
209
|
if (message.method === `${TA_CLIENT_SERVICE}/onExtensionData`) {
|
|
195
210
|
const [name, keys, cwd] = message.params;
|
|
196
211
|
for (const listener of this.extensionDataListeners) {
|
|
197
212
|
listener(name, keys, cwd !== null && cwd !== void 0 ? cwd : undefined);
|
|
198
213
|
}
|
|
199
|
-
(
|
|
214
|
+
(_e = this.socket) === null || _e === void 0 ? void 0 : _e.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
200
215
|
return;
|
|
201
216
|
}
|
|
202
217
|
const call = this.pending.get(message.id);
|
|
@@ -205,7 +220,7 @@ export class TaConnection {
|
|
|
205
220
|
}
|
|
206
221
|
this.pending.delete(message.id);
|
|
207
222
|
if (message.error) {
|
|
208
|
-
const data = (
|
|
223
|
+
const data = (_f = message.error.data) === null || _f === void 0 ? void 0 : _f.data;
|
|
209
224
|
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));
|
|
210
225
|
}
|
|
211
226
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-connection.js","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EAGpB,WAAW,
|
|
1
|
+
{"version":3,"file":"ta-connection.js","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,10 @@ export interface RetryState {
|
|
|
23
23
|
errorMessage: string;
|
|
24
24
|
}
|
|
25
25
|
/** What a UI shows of a session. */
|
|
26
|
+
export interface SessionWidget {
|
|
27
|
+
lines: string[];
|
|
28
|
+
placement: 'aboveEditor' | 'belowEditor';
|
|
29
|
+
}
|
|
26
30
|
export interface SessionState {
|
|
27
31
|
/** The agent is working, from the start of a run until it has settled. */
|
|
28
32
|
working: boolean;
|
|
@@ -37,6 +41,13 @@ export interface SessionState {
|
|
|
37
41
|
notices: Notice[];
|
|
38
42
|
/** What extensions show with `setStatus`. */
|
|
39
43
|
status: Record<string, string>;
|
|
44
|
+
/** The lines extensions show with `setWidget`, by key, above the message box or below it. */
|
|
45
|
+
widgets: Record<string, SessionWidget>;
|
|
46
|
+
/** Text an extension put in the message box (`setEditorText`): a client takes it once, by its id. */
|
|
47
|
+
editorText?: {
|
|
48
|
+
id: string;
|
|
49
|
+
text: string;
|
|
50
|
+
};
|
|
40
51
|
closed: boolean;
|
|
41
52
|
/** The index in `messages` where the run of now starts: unknown for a run that started before this client attached. */
|
|
42
53
|
runStart?: number;
|
|
@@ -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,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,
|
|
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,aAAa;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,aAAa,GAAG,aAAa,CAAC;CAC5C;AAED,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,6FAA6F;IAC7F,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACvC,qGAAqG;IACrG,UAAU,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,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,CAiDxE;CAwFJ"}
|
|
@@ -6,7 +6,7 @@ var SessionReducer;
|
|
|
6
6
|
const DIALOGS = new Set(['select', 'confirm', 'input', 'editor']);
|
|
7
7
|
const MAX_NOTICES = 20;
|
|
8
8
|
function initial() {
|
|
9
|
-
return { working: false, messages: [], tools: {}, pendingUi: [], pendingClientTools: [], notices: [], status: {}, closed: false };
|
|
9
|
+
return { working: false, messages: [], tools: {}, pendingUi: [], pendingClientTools: [], notices: [], status: {}, widgets: {}, closed: false };
|
|
10
10
|
}
|
|
11
11
|
SessionReducer.initial = initial;
|
|
12
12
|
/** The next state; the previous one stays valid, so that UIs can compare by identity. */
|
|
@@ -52,6 +52,8 @@ var SessionReducer;
|
|
|
52
52
|
}
|
|
53
53
|
case 'auto_retry_end':
|
|
54
54
|
return { ...state, retry: undefined };
|
|
55
|
+
case 'extension_error':
|
|
56
|
+
return withNotice(state, { id: crypto.randomUUID(), message: extensionError(event), type: 'error' });
|
|
55
57
|
case 'session_closed':
|
|
56
58
|
return { ...state, closed: true, working: false, pendingUi: [], pendingClientTools: [] };
|
|
57
59
|
default:
|
|
@@ -75,19 +77,39 @@ var SessionReducer;
|
|
|
75
77
|
function withTool(state, toolCallId, run) {
|
|
76
78
|
return { ...state, tools: { ...state.tools, [toolCallId]: run } };
|
|
77
79
|
}
|
|
80
|
+
/** What failed, as the user knows it: a command by its name. */
|
|
81
|
+
function extensionError(event) {
|
|
82
|
+
const source = event.extensionPath.startsWith('command:') ? `/${event.extensionPath.slice('command:'.length)}` : event.extensionPath;
|
|
83
|
+
return `${source}: ${event.error}`;
|
|
84
|
+
}
|
|
85
|
+
function withNotice(state, notice) {
|
|
86
|
+
return { ...state, notices: [...state.notices, notice].slice(-MAX_NOTICES) };
|
|
87
|
+
}
|
|
78
88
|
function applyUiRequest(state, request) {
|
|
79
89
|
var _a;
|
|
90
|
+
var _b, _c;
|
|
80
91
|
if (DIALOGS.has(request.method)) {
|
|
81
92
|
return { ...state, pendingUi: [...state.pendingUi, request] };
|
|
82
93
|
}
|
|
83
94
|
if (request.method === 'notify') {
|
|
84
|
-
|
|
85
|
-
return { ...state, notices: [...state.notices, notice].slice(-MAX_NOTICES) };
|
|
95
|
+
return withNotice(state, { id: request.id, message: request.message, type: (_b = request.notifyType) !== null && _b !== void 0 ? _b : 'info' });
|
|
86
96
|
}
|
|
87
97
|
if (request.method === 'setStatus') {
|
|
88
98
|
const { [request.statusKey]: _old, ...status } = state.status;
|
|
89
99
|
return { ...state, status: request.statusText === undefined ? status : { ...status, [request.statusKey]: request.statusText } };
|
|
90
100
|
}
|
|
101
|
+
if (request.method === 'setWidget') {
|
|
102
|
+
const { [request.widgetKey]: _old, ...widgets } = state.widgets;
|
|
103
|
+
return {
|
|
104
|
+
...state,
|
|
105
|
+
widgets: ((_a = request.widgetLines) === null || _a === void 0 ? void 0 : _a.length)
|
|
106
|
+
? { ...widgets, [request.widgetKey]: { lines: request.widgetLines, placement: (_c = request.widgetPlacement) !== null && _c !== void 0 ? _c : 'aboveEditor' } }
|
|
107
|
+
: widgets,
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
if (request.method === 'set_editor_text') {
|
|
111
|
+
return { ...state, editorText: { id: request.id, text: request.text } };
|
|
112
|
+
}
|
|
91
113
|
return state;
|
|
92
114
|
}
|
|
93
115
|
function applyDelta(message, delta) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-reducer.js","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"session-reducer.js","sourceRoot":"","sources":["../../src/common/session-reducer.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,6 +78,28 @@ const assistant = (content = []) => ({ role: 'assistant', content });
|
|
|
78
78
|
(0, bun_test_1.expect)(waiting.pendingClientTools).toEqual([request]);
|
|
79
79
|
(0, bun_test_1.expect)(run([{ type: 'client_tool_resolved', id: 't1' }], waiting).pendingClientTools).toEqual([]);
|
|
80
80
|
});
|
|
81
|
+
(0, bun_test_1.it)('tells a failed command or extension as an error notice', () => {
|
|
82
|
+
const state = run([
|
|
83
|
+
{ type: 'extension_error', extensionPath: 'command:bug', event: 'command', error: 'boom' },
|
|
84
|
+
{ type: 'extension_error', extensionPath: '/x/ext.ts', event: 'tool_call', error: 'bad' },
|
|
85
|
+
]);
|
|
86
|
+
(0, bun_test_1.expect)(state.notices.map(({ message, type }) => ({ message, type }))).toEqual([
|
|
87
|
+
{ message: '/bug: boom', type: 'error' },
|
|
88
|
+
{ message: '/x/ext.ts: bad', type: 'error' },
|
|
89
|
+
]);
|
|
90
|
+
(0, bun_test_1.expect)(new Set(state.notices.map(notice => notice.id)).size).toBe(2);
|
|
91
|
+
});
|
|
92
|
+
(0, bun_test_1.it)('keeps the widgets of extensions, and the text they put in the message box', () => {
|
|
93
|
+
const ui = (request) => ({ type: 'extension_ui_request', id: crypto.randomUUID(), ...request });
|
|
94
|
+
const state = run([
|
|
95
|
+
ui({ method: 'setWidget', widgetKey: 'todo', widgetLines: ['- a'] }),
|
|
96
|
+
ui({ method: 'setWidget', widgetKey: 'log', widgetLines: ['x'], widgetPlacement: 'belowEditor' }),
|
|
97
|
+
ui({ method: 'setWidget', widgetKey: 'log', widgetLines: undefined }),
|
|
98
|
+
{ type: 'extension_ui_request', id: 'e1', method: 'set_editor_text', text: '/weixin-login' },
|
|
99
|
+
]);
|
|
100
|
+
(0, bun_test_1.expect)(state.widgets).toEqual({ todo: { lines: ['- a'], placement: 'aboveEditor' } });
|
|
101
|
+
(0, bun_test_1.expect)(state.editorText).toEqual({ id: 'e1', text: '/weixin-login' });
|
|
102
|
+
});
|
|
81
103
|
(0, bun_test_1.it)('keeps the latest notices', () => {
|
|
82
104
|
const notices = Array.from({ length: 25 }, (_, i) => ({ type: 'extension_ui_request', id: `n${i}`, method: 'notify', message: `m${i}` }));
|
|
83
105
|
const state = run(notices);
|
|
@@ -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,uFAAuF,EAAE,GAAG,EAAE;QAC7F,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,GAAG,CAAC;YACd,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;YAC/C,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE;YACjI,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACtH,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,qBAAqB,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;SAC7H,CAAC,CAAC;QACH,IAAA,iBAAM,EAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC;IACnI,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,2DAA2D,EAAE,GAAG,EAAE;QACjE,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;QACnH,IAAA,iBAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,UAAU,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QACrF,IAAA,iBAAM,EAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChD,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;QACxI,MAAM,QAAQ,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QACrI,IAAA,iBAAM,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1G,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACrG,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;IAC7F,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,yCAAyC,EAAE,GAAG,EAAE;QAC/C,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5H,IAAA,iBAAM,EAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,sDAAsD,EAAE,GAAG,EAAE;QAC5D,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,qBAAqB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACvF,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/B,IAAA,iBAAM,EAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAU,CAAC,CAAC;QAC/D,IAAA,iBAAM,EAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;IAEH,IAAA,aAAE,EAAC,0BAA0B,EAAE,GAAG,EAAE;QAChC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC1I,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAA,iBAAM,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACvC,IAAA,iBAAM,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACtF,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/common/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,sBAAsB,EACtB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EACb,eAAe,EACf,aAAa,EAChB,MAAM,qBAAqB,CAAC;AAC7B,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;;;;GAIG;AACH,MAAM,WAAW,UAAU;IACvB,UAAU,EAAE,sBAAsB,CAAC;IACnC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;CAC/E;AAED,MAAM,WAAW,mBAAmB;IAChC,0GAA0G;IAC1G,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;CAC9B;AAED;;;GAGG;AACH,qBAAa,YAAY;IAajB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,YAAY;IAC3C,QAAQ,CAAC,SAAS,EAAE,MAAM;IAb9B,SAAS,CAAC,OAAO,eAA4B;IAC7C,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,QAAQ,CAAC,SAAS,gBAAuB;IACnD,SAAS,CAAC,QAAQ,CAAC,cAAc,cAAmB,OAAO,KAAK,IAAI,EAAI;IACxE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE,CAAM;IAC7C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACxD,2EAA2E;IAC3E,SAAS,CAAC,QAAQ,CAAC,OAAO,cAAqB;IAC/C,uDAAuD;IACvD,SAAS,CAAC,QAAQ,CAAC,OAAO,kCAAyC;IAEnE,YACuB,UAAU,EAAE,YAAY,EAClC,SAAS,EAAE,MAAM,EAC1B,OAAO,GAAE,mBAAwB,EAGpC;IAED,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,qEAAqE;IACrE,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,GAAG,MAAM,IAAI,CAGtD;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,
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/common/session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,17 @@ class SessionStore {
|
|
|
59
59
|
this.lastSeq = result.lastSeq;
|
|
60
60
|
}
|
|
61
61
|
this.apply(result.events);
|
|
62
|
-
|
|
62
|
+
let state = {
|
|
63
|
+
...this.current,
|
|
64
|
+
pendingUi: result.pendingUi,
|
|
65
|
+
pendingClientTools: result.pendingClientTools,
|
|
66
|
+
working: result.info.isStreaming,
|
|
67
|
+
};
|
|
68
|
+
if (result.shownUi) {
|
|
69
|
+
// What the extensions show now, whatever events were missed.
|
|
70
|
+
state = result.shownUi.reduce(session_reducer_1.SessionReducer.reduce, { ...state, status: {}, widgets: {} });
|
|
71
|
+
}
|
|
72
|
+
this.update(state);
|
|
63
73
|
return result;
|
|
64
74
|
}
|
|
65
75
|
async reload() {
|
|
@@ -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 TaAuthEvent, type TaAuthServer, TaErrorCode, type TaEventEnvelope, type TaPackageServer, type TaRelayServer, type TaServer, type TaSettingsServer, type TaTerminalServer, type TaWorkspaceServer } from '@celljs/ta-protocol';
|
|
1
|
+
import { type TaAuthEvent, type TaAuthServer, TaErrorCode, type TaEventEnvelope, type TaPackageServer, type TaRelayServer, type TaRemoteEvent, type TaRemoteServer, 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;
|
|
@@ -40,6 +40,7 @@ type EventsListener = (events: TaEventEnvelope[]) => void;
|
|
|
40
40
|
type TerminalListener = (terminalId: string, data: string, exitCode?: number) => void;
|
|
41
41
|
type ExtensionDataListener = (name: string, keys: string[], cwd?: string) => void;
|
|
42
42
|
type AuthEventListener = (loginId: string, event: TaAuthEvent) => void;
|
|
43
|
+
type RemoteEventListener = (event: TaRemoteEvent) => void;
|
|
43
44
|
type OpenListener = () => void;
|
|
44
45
|
type CloseListener = () => void;
|
|
45
46
|
type ReconnectingListener = (delayMs: number, attempt: number) => void;
|
|
@@ -60,6 +61,7 @@ export declare class TaConnection {
|
|
|
60
61
|
readonly packages: TaPackageServer;
|
|
61
62
|
readonly auth: TaAuthServer;
|
|
62
63
|
readonly relay: TaRelayServer;
|
|
64
|
+
readonly remote: TaRemoteServer;
|
|
63
65
|
protected socket?: TaSocket;
|
|
64
66
|
protected closed: boolean;
|
|
65
67
|
protected attempts: number;
|
|
@@ -70,6 +72,7 @@ export declare class TaConnection {
|
|
|
70
72
|
protected readonly terminalListeners: Set<TerminalListener>;
|
|
71
73
|
protected readonly extensionDataListeners: Set<ExtensionDataListener>;
|
|
72
74
|
protected readonly authListeners: Set<AuthEventListener>;
|
|
75
|
+
protected readonly remoteListeners: Set<RemoteEventListener>;
|
|
73
76
|
protected readonly openListeners: Set<OpenListener>;
|
|
74
77
|
protected readonly closeListeners: Set<CloseListener>;
|
|
75
78
|
protected readonly reconnectingListeners: Set<ReconnectingListener>;
|
|
@@ -84,6 +87,8 @@ export declare class TaConnection {
|
|
|
84
87
|
onExtensionData(listener: ExtensionDataListener): () => void;
|
|
85
88
|
/** What happens during the sign-ins of this connection (TaAuthServer.login). */
|
|
86
89
|
onAuthEvent(listener: AuthEventListener): () => void;
|
|
90
|
+
/** What happens with the remote machines, once this connection called TaRemoteServer.watch. */
|
|
91
|
+
onRemoteEvent(listener: RemoteEventListener): () => void;
|
|
87
92
|
onOpen(listener: OpenListener): () => void;
|
|
88
93
|
/** Runs each time an open connection is lost; it reconnects unless closed. */
|
|
89
94
|
onClose(listener: CloseListener): () => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-connection.d.ts","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ta-connection.d.ts","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,7 @@ class TaConnection {
|
|
|
30
30
|
this.packages = this.service(ta_protocol_1.TA_PACKAGE_SERVICE);
|
|
31
31
|
this.auth = this.service(ta_protocol_1.TA_AUTH_SERVICE);
|
|
32
32
|
this.relay = this.service(ta_protocol_1.TA_RELAY_SERVICE);
|
|
33
|
+
this.remote = this.service(ta_protocol_1.TA_REMOTE_SERVICE);
|
|
33
34
|
this.closed = false;
|
|
34
35
|
this.attempts = 0;
|
|
35
36
|
this.nextId = 0;
|
|
@@ -38,6 +39,7 @@ class TaConnection {
|
|
|
38
39
|
this.terminalListeners = new Set();
|
|
39
40
|
this.extensionDataListeners = new Set();
|
|
40
41
|
this.authListeners = new Set();
|
|
42
|
+
this.remoteListeners = new Set();
|
|
41
43
|
this.openListeners = new Set();
|
|
42
44
|
this.closeListeners = new Set();
|
|
43
45
|
this.reconnectingListeners = new Set();
|
|
@@ -71,6 +73,11 @@ class TaConnection {
|
|
|
71
73
|
this.authListeners.add(listener);
|
|
72
74
|
return () => this.authListeners.delete(listener);
|
|
73
75
|
}
|
|
76
|
+
/** What happens with the remote machines, once this connection called TaRemoteServer.watch. */
|
|
77
|
+
onRemoteEvent(listener) {
|
|
78
|
+
this.remoteListeners.add(listener);
|
|
79
|
+
return () => this.remoteListeners.delete(listener);
|
|
80
|
+
}
|
|
74
81
|
onOpen(listener) {
|
|
75
82
|
this.openListeners.add(listener);
|
|
76
83
|
return () => this.openListeners.delete(listener);
|
|
@@ -168,7 +175,7 @@ class TaConnection {
|
|
|
168
175
|
});
|
|
169
176
|
}
|
|
170
177
|
receive(text) {
|
|
171
|
-
var _a, _b, _c, _d, _e;
|
|
178
|
+
var _a, _b, _c, _d, _e, _f;
|
|
172
179
|
const message = JSON.parse(text);
|
|
173
180
|
if (message.method === `${ta_protocol_1.TA_CLIENT_SERVICE}/onEvents`) {
|
|
174
181
|
const [events] = message.params;
|
|
@@ -195,12 +202,20 @@ class TaConnection {
|
|
|
195
202
|
(_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
196
203
|
return;
|
|
197
204
|
}
|
|
205
|
+
if (message.method === `${ta_protocol_1.TA_CLIENT_SERVICE}/onRemoteEvent`) {
|
|
206
|
+
const [event] = message.params;
|
|
207
|
+
for (const listener of this.remoteListeners) {
|
|
208
|
+
listener(event);
|
|
209
|
+
}
|
|
210
|
+
(_d = this.socket) === null || _d === void 0 ? void 0 : _d.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
198
213
|
if (message.method === `${ta_protocol_1.TA_CLIENT_SERVICE}/onExtensionData`) {
|
|
199
214
|
const [name, keys, cwd] = message.params;
|
|
200
215
|
for (const listener of this.extensionDataListeners) {
|
|
201
216
|
listener(name, keys, cwd !== null && cwd !== void 0 ? cwd : undefined);
|
|
202
217
|
}
|
|
203
|
-
(
|
|
218
|
+
(_e = this.socket) === null || _e === void 0 ? void 0 : _e.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
204
219
|
return;
|
|
205
220
|
}
|
|
206
221
|
const call = this.pending.get(message.id);
|
|
@@ -209,7 +224,7 @@ class TaConnection {
|
|
|
209
224
|
}
|
|
210
225
|
this.pending.delete(message.id);
|
|
211
226
|
if (message.error) {
|
|
212
|
-
const data = (
|
|
227
|
+
const data = (_f = message.error.data) === null || _f === void 0 ? void 0 : _f.data;
|
|
213
228
|
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));
|
|
214
229
|
}
|
|
215
230
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ta-connection.js","sourceRoot":"","sources":["../../src/common/ta-connection.ts"],"names":[],"mappings":";;;AAAA,
|
|
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.
|
|
3
|
+
"version": "4.8.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.
|
|
31
|
+
"@celljs/ta-protocol": "4.8.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@earendil-works/pi-ai": "^1.5.0",
|
|
@@ -88,6 +88,30 @@ describe('SessionReducer', () => {
|
|
|
88
88
|
expect(run([{ type: 'client_tool_resolved', id: 't1' }], waiting).pendingClientTools).toEqual([]);
|
|
89
89
|
});
|
|
90
90
|
|
|
91
|
+
it('tells a failed command or extension as an error notice', () => {
|
|
92
|
+
const state = run([
|
|
93
|
+
{ type: 'extension_error', extensionPath: 'command:bug', event: 'command', error: 'boom' },
|
|
94
|
+
{ type: 'extension_error', extensionPath: '/x/ext.ts', event: 'tool_call', error: 'bad' },
|
|
95
|
+
]);
|
|
96
|
+
expect(state.notices.map(({ message, type }) => ({ message, type }))).toEqual([
|
|
97
|
+
{ message: '/bug: boom', type: 'error' },
|
|
98
|
+
{ message: '/x/ext.ts: bad', type: 'error' },
|
|
99
|
+
]);
|
|
100
|
+
expect(new Set(state.notices.map(notice => notice.id)).size).toBe(2);
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
it('keeps the widgets of extensions, and the text they put in the message box', () => {
|
|
104
|
+
const ui = (request: object) => ({ type: 'extension_ui_request', id: crypto.randomUUID(), ...request });
|
|
105
|
+
const state = run([
|
|
106
|
+
ui({ method: 'setWidget', widgetKey: 'todo', widgetLines: ['- a'] }),
|
|
107
|
+
ui({ method: 'setWidget', widgetKey: 'log', widgetLines: ['x'], widgetPlacement: 'belowEditor' }),
|
|
108
|
+
ui({ method: 'setWidget', widgetKey: 'log', widgetLines: undefined }),
|
|
109
|
+
{ type: 'extension_ui_request', id: 'e1', method: 'set_editor_text', text: '/weixin-login' },
|
|
110
|
+
]);
|
|
111
|
+
expect(state.widgets).toEqual({ todo: { lines: ['- a'], placement: 'aboveEditor' } });
|
|
112
|
+
expect(state.editorText).toEqual({ id: 'e1', text: '/weixin-login' });
|
|
113
|
+
});
|
|
114
|
+
|
|
91
115
|
it('keeps the latest notices', () => {
|
|
92
116
|
const notices = Array.from({ length: 25 }, (_, i) => ({ type: 'extension_ui_request', id: `n${i}`, method: 'notify', message: `m${i}` }));
|
|
93
117
|
const state = run(notices);
|
|
@@ -28,6 +28,11 @@ export interface RetryState {
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
/** What a UI shows of a session. */
|
|
31
|
+
export interface SessionWidget {
|
|
32
|
+
lines: string[];
|
|
33
|
+
placement: 'aboveEditor' | 'belowEditor';
|
|
34
|
+
}
|
|
35
|
+
|
|
31
36
|
export interface SessionState {
|
|
32
37
|
/** The agent is working, from the start of a run until it has settled. */
|
|
33
38
|
working: boolean;
|
|
@@ -42,6 +47,10 @@ export interface SessionState {
|
|
|
42
47
|
notices: Notice[];
|
|
43
48
|
/** What extensions show with `setStatus`. */
|
|
44
49
|
status: Record<string, string>;
|
|
50
|
+
/** The lines extensions show with `setWidget`, by key, above the message box or below it. */
|
|
51
|
+
widgets: Record<string, SessionWidget>;
|
|
52
|
+
/** Text an extension put in the message box (`setEditorText`): a client takes it once, by its id. */
|
|
53
|
+
editorText?: { id: string; text: string };
|
|
45
54
|
closed: boolean;
|
|
46
55
|
/** The index in `messages` where the run of now starts: unknown for a run that started before this client attached. */
|
|
47
56
|
runStart?: number;
|
|
@@ -64,7 +73,7 @@ export namespace SessionReducer {
|
|
|
64
73
|
const MAX_NOTICES = 20;
|
|
65
74
|
|
|
66
75
|
export function initial(): SessionState {
|
|
67
|
-
return { working: false, messages: [], tools: {}, pendingUi: [], pendingClientTools: [], notices: [], status: {}, closed: false };
|
|
76
|
+
return { working: false, messages: [], tools: {}, pendingUi: [], pendingClientTools: [], notices: [], status: {}, widgets: {}, closed: false };
|
|
68
77
|
}
|
|
69
78
|
|
|
70
79
|
/** The next state; the previous one stays valid, so that UIs can compare by identity. */
|
|
@@ -110,6 +119,8 @@ export namespace SessionReducer {
|
|
|
110
119
|
}
|
|
111
120
|
case 'auto_retry_end':
|
|
112
121
|
return { ...state, retry: undefined };
|
|
122
|
+
case 'extension_error':
|
|
123
|
+
return withNotice(state, { id: crypto.randomUUID(), message: extensionError(event), type: 'error' });
|
|
113
124
|
case 'session_closed':
|
|
114
125
|
return { ...state, closed: true, working: false, pendingUi: [], pendingClientTools: [] };
|
|
115
126
|
default:
|
|
@@ -136,18 +147,39 @@ export namespace SessionReducer {
|
|
|
136
147
|
return { ...state, tools: { ...state.tools, [toolCallId]: run } };
|
|
137
148
|
}
|
|
138
149
|
|
|
150
|
+
/** What failed, as the user knows it: a command by its name. */
|
|
151
|
+
function extensionError(event: { extensionPath: string; error: string }): string {
|
|
152
|
+
const source = event.extensionPath.startsWith('command:') ? `/${event.extensionPath.slice('command:'.length)}` : event.extensionPath;
|
|
153
|
+
return `${source}: ${event.error}`;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
function withNotice(state: SessionState, notice: Notice): SessionState {
|
|
157
|
+
return { ...state, notices: [...state.notices, notice].slice(-MAX_NOTICES) };
|
|
158
|
+
}
|
|
159
|
+
|
|
139
160
|
function applyUiRequest(state: SessionState, request: RpcExtensionUIRequest): SessionState {
|
|
140
161
|
if (DIALOGS.has(request.method)) {
|
|
141
162
|
return { ...state, pendingUi: [...state.pendingUi, request] };
|
|
142
163
|
}
|
|
143
164
|
if (request.method === 'notify') {
|
|
144
|
-
|
|
145
|
-
return { ...state, notices: [...state.notices, notice].slice(-MAX_NOTICES) };
|
|
165
|
+
return withNotice(state, { id: request.id, message: request.message, type: request.notifyType ?? 'info' });
|
|
146
166
|
}
|
|
147
167
|
if (request.method === 'setStatus') {
|
|
148
168
|
const { [request.statusKey]: _old, ...status } = state.status;
|
|
149
169
|
return { ...state, status: request.statusText === undefined ? status : { ...status, [request.statusKey]: request.statusText } };
|
|
150
170
|
}
|
|
171
|
+
if (request.method === 'setWidget') {
|
|
172
|
+
const { [request.widgetKey]: _old, ...widgets } = state.widgets;
|
|
173
|
+
return {
|
|
174
|
+
...state,
|
|
175
|
+
widgets: request.widgetLines?.length
|
|
176
|
+
? { ...widgets, [request.widgetKey]: { lines: request.widgetLines, placement: request.widgetPlacement ?? 'aboveEditor' } }
|
|
177
|
+
: widgets,
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
if (request.method === 'set_editor_text') {
|
|
181
|
+
return { ...state, editorText: { id: request.id, text: request.text } };
|
|
182
|
+
}
|
|
151
183
|
return state;
|
|
152
184
|
}
|
|
153
185
|
|
|
@@ -102,7 +102,17 @@ export class SessionStore {
|
|
|
102
102
|
this.lastSeq = result.lastSeq;
|
|
103
103
|
}
|
|
104
104
|
this.apply(result.events);
|
|
105
|
-
|
|
105
|
+
let state: SessionState = {
|
|
106
|
+
...this.current,
|
|
107
|
+
pendingUi: result.pendingUi,
|
|
108
|
+
pendingClientTools: result.pendingClientTools,
|
|
109
|
+
working: result.info.isStreaming,
|
|
110
|
+
};
|
|
111
|
+
if (result.shownUi) {
|
|
112
|
+
// What the extensions show now, whatever events were missed.
|
|
113
|
+
state = result.shownUi.reduce(SessionReducer.reduce, { ...state, status: {}, widgets: {} });
|
|
114
|
+
}
|
|
115
|
+
this.update(state);
|
|
106
116
|
return result;
|
|
107
117
|
}
|
|
108
118
|
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
TA_CLIENT_SERVICE,
|
|
4
4
|
TA_PACKAGE_SERVICE,
|
|
5
5
|
TA_RELAY_SERVICE,
|
|
6
|
+
TA_REMOTE_SERVICE,
|
|
6
7
|
TA_SERVER_SERVICE,
|
|
7
8
|
TA_SETTINGS_SERVICE,
|
|
8
9
|
TA_TERMINAL_SERVICE,
|
|
@@ -14,6 +15,8 @@ import {
|
|
|
14
15
|
type TaEventEnvelope,
|
|
15
16
|
type TaPackageServer,
|
|
16
17
|
type TaRelayServer,
|
|
18
|
+
type TaRemoteEvent,
|
|
19
|
+
type TaRemoteServer,
|
|
17
20
|
type TaServer,
|
|
18
21
|
type TaSettingsServer,
|
|
19
22
|
type TaTerminalServer,
|
|
@@ -76,6 +79,7 @@ type EventsListener = (events: TaEventEnvelope[]) => void;
|
|
|
76
79
|
type TerminalListener = (terminalId: string, data: string, exitCode?: number) => void;
|
|
77
80
|
type ExtensionDataListener = (name: string, keys: string[], cwd?: string) => void;
|
|
78
81
|
type AuthEventListener = (loginId: string, event: TaAuthEvent) => void;
|
|
82
|
+
type RemoteEventListener = (event: TaRemoteEvent) => void;
|
|
79
83
|
type OpenListener = () => void;
|
|
80
84
|
type CloseListener = () => void;
|
|
81
85
|
type ReconnectingListener = (delayMs: number, attempt: number) => void;
|
|
@@ -96,6 +100,7 @@ export class TaConnection {
|
|
|
96
100
|
readonly packages = this.service<TaPackageServer>(TA_PACKAGE_SERVICE);
|
|
97
101
|
readonly auth = this.service<TaAuthServer>(TA_AUTH_SERVICE);
|
|
98
102
|
readonly relay = this.service<TaRelayServer>(TA_RELAY_SERVICE);
|
|
103
|
+
readonly remote = this.service<TaRemoteServer>(TA_REMOTE_SERVICE);
|
|
99
104
|
|
|
100
105
|
protected socket?: TaSocket;
|
|
101
106
|
protected closed = false;
|
|
@@ -107,6 +112,7 @@ export class TaConnection {
|
|
|
107
112
|
protected readonly terminalListeners = new Set<TerminalListener>();
|
|
108
113
|
protected readonly extensionDataListeners = new Set<ExtensionDataListener>();
|
|
109
114
|
protected readonly authListeners = new Set<AuthEventListener>();
|
|
115
|
+
protected readonly remoteListeners = new Set<RemoteEventListener>();
|
|
110
116
|
protected readonly openListeners = new Set<OpenListener>();
|
|
111
117
|
protected readonly closeListeners = new Set<CloseListener>();
|
|
112
118
|
protected readonly reconnectingListeners = new Set<ReconnectingListener>();
|
|
@@ -147,6 +153,12 @@ export class TaConnection {
|
|
|
147
153
|
return () => this.authListeners.delete(listener);
|
|
148
154
|
}
|
|
149
155
|
|
|
156
|
+
/** What happens with the remote machines, once this connection called TaRemoteServer.watch. */
|
|
157
|
+
onRemoteEvent(listener: RemoteEventListener): () => void {
|
|
158
|
+
this.remoteListeners.add(listener);
|
|
159
|
+
return () => this.remoteListeners.delete(listener);
|
|
160
|
+
}
|
|
161
|
+
|
|
150
162
|
onOpen(listener: OpenListener): () => void {
|
|
151
163
|
this.openListeners.add(listener);
|
|
152
164
|
return () => this.openListeners.delete(listener);
|
|
@@ -282,6 +294,14 @@ export class TaConnection {
|
|
|
282
294
|
this.socket?.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
283
295
|
return;
|
|
284
296
|
}
|
|
297
|
+
if (message.method === `${TA_CLIENT_SERVICE}/onRemoteEvent`) {
|
|
298
|
+
const [event] = message.params as [TaRemoteEvent];
|
|
299
|
+
for (const listener of this.remoteListeners) {
|
|
300
|
+
listener(event);
|
|
301
|
+
}
|
|
302
|
+
this.socket?.send(JSON.stringify({ jsonrpc: '2.0', id: message.id, result: null }));
|
|
303
|
+
return;
|
|
304
|
+
}
|
|
285
305
|
if (message.method === `${TA_CLIENT_SERVICE}/onExtensionData`) {
|
|
286
306
|
const [name, keys, cwd] = message.params as [string, string[], string | null | undefined];
|
|
287
307
|
for (const listener of this.extensionDataListeners) {
|