@dsh-teamwork/dsh-teamwork 0.8.4 → 0.10.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.md +5 -2
- package/README.zh-CN.md +1 -1
- package/assets/readme/icon-256.png +0 -0
- package/assets/readme/review-and-publish.png +0 -0
- package/assets/readme/teamwork-panel.png +0 -0
- package/assets/readme/versions-and-backups.png +0 -0
- package/docs/development.md +88 -3
- package/docs/en/guide.md +50 -2
- package/docs/zh-CN/guide.md +20 -2
- package/icon.svg +7 -4
- package/lib/audit-archive.js +174 -0
- package/lib/audit-archive.js.map +1 -0
- package/lib/audit-cli.js +91 -0
- package/lib/audit-cli.js.map +1 -0
- package/lib/bridge.js +32 -10
- package/lib/bridge.js.map +1 -1
- package/lib/client.js +58 -15
- package/lib/client.js.map +1 -1
- package/lib/config-sync.js +1 -1
- package/lib/config-sync.js.map +1 -1
- package/lib/index.js +356 -97
- package/lib/index.js.map +1 -1
- package/lib/locale.js +18 -0
- package/lib/locale.js.map +1 -0
- package/lib/login-callback.js +1 -1
- package/lib/login-callback.js.map +1 -1
- package/lib/messages.js +119 -0
- package/lib/messages.js.map +1 -0
- package/lib/panel.js +27 -20
- package/lib/panel.js.map +1 -1
- package/lib/phone-security.js +120 -2
- package/lib/phone-security.js.map +1 -1
- package/lib/pin-lock.js +89 -0
- package/lib/pin-lock.js.map +1 -0
- package/lib/platform-models.js +10 -7
- package/lib/platform-models.js.map +1 -1
- package/lib/plugin-status.js +4 -4
- package/lib/plugin-status.js.map +1 -1
- package/lib/preset-session.js +2 -1
- package/lib/preset-session.js.map +1 -1
- package/lib/relay.js +14 -9
- package/lib/relay.js.map +1 -1
- package/lib/shared-mode.js +151 -0
- package/lib/shared-mode.js.map +1 -0
- package/lib/shared-owner.js +122 -0
- package/lib/shared-owner.js.map +1 -0
- package/lib/shared-roster.js +112 -0
- package/lib/shared-roster.js.map +1 -0
- package/lib/task-session.js +55 -19
- package/lib/task-session.js.map +1 -1
- package/lib/token-file.js +34 -0
- package/lib/token-file.js.map +1 -0
- package/lib/types/audit-archive.d.ts +78 -0
- package/lib/types/audit-archive.d.ts.map +1 -0
- package/lib/types/audit-cli.d.ts +14 -0
- package/lib/types/audit-cli.d.ts.map +1 -0
- package/lib/types/bridge.d.ts +7 -3
- package/lib/types/bridge.d.ts.map +1 -1
- package/lib/types/client.d.ts +27 -4
- package/lib/types/client.d.ts.map +1 -1
- package/lib/types/index.d.ts +3 -0
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/locale.d.ts +13 -0
- package/lib/types/locale.d.ts.map +1 -0
- package/lib/types/messages.d.ts +67 -0
- package/lib/types/messages.d.ts.map +1 -0
- package/lib/types/panel.d.ts +64 -8
- package/lib/types/panel.d.ts.map +1 -1
- package/lib/types/phone-security.d.ts +37 -0
- package/lib/types/phone-security.d.ts.map +1 -1
- package/lib/types/pin-lock.d.ts +36 -0
- package/lib/types/pin-lock.d.ts.map +1 -0
- package/lib/types/platform-models.d.ts.map +1 -1
- package/lib/types/preset-session.d.ts.map +1 -1
- package/lib/types/relay.d.ts +15 -1
- package/lib/types/relay.d.ts.map +1 -1
- package/lib/types/shared-mode.d.ts +50 -0
- package/lib/types/shared-mode.d.ts.map +1 -0
- package/lib/types/shared-owner.d.ts +42 -0
- package/lib/types/shared-owner.d.ts.map +1 -0
- package/lib/types/shared-roster.d.ts +49 -0
- package/lib/types/shared-roster.d.ts.map +1 -0
- package/lib/types/task-session.d.ts +63 -2
- package/lib/types/task-session.d.ts.map +1 -1
- package/lib/types/token-file.d.ts +11 -0
- package/lib/types/token-file.d.ts.map +1 -0
- package/lib/web/client.js +1138 -378
- package/package.json +8 -1
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared mode (the server's `docs/tech/shared-dsh.md`): this DSH is a team's, signed in by a team host
|
|
3
|
+
* key instead of a person. The key is kept beside the cache (`<cache>.shared.json`, mode 0600) and traded for a host token
|
|
4
|
+
* (platform ADR 0047): the server sends a nonce, this DSH signs it with its identity key, and the first exchange binds the
|
|
5
|
+
* key to that identity, so the key copied to another machine is refused. The token lasts an hour and is renewed before it ends.
|
|
6
|
+
*/
|
|
7
|
+
import { randomBytes } from 'node:crypto';
|
|
8
|
+
import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
|
|
9
|
+
import { dirname } from 'node:path';
|
|
10
|
+
import { z } from 'zod';
|
|
11
|
+
const KEY = /^dshh_([0-9a-f]{1,32})_[A-Za-z0-9_-]{43}$/;
|
|
12
|
+
const fileSchema = z.object({ key: z.string().regex(KEY) });
|
|
13
|
+
const challengeSchema = z.object({ nonce: z.string().min(1).max(200) });
|
|
14
|
+
const tokenSchema = z.object({ token: z.string().min(1), expiresAt: z.string(), hostId: z.string(), teamId: z.string(), name: z.string() });
|
|
15
|
+
/** Renew this long before the token ends, and retry this soon after a failure that may pass. */
|
|
16
|
+
const RENEW_BEFORE_MS = 10 * 60 * 1000;
|
|
17
|
+
const RETRY_MS = 60 * 1000;
|
|
18
|
+
export const sharedKeyPath = (cachePath) => cachePath.replace(/(\.json)?$/, '.shared.json');
|
|
19
|
+
/** What the server's refusal means for the key: `invalid` (unknown, rotated or deleted) and `elsewhere` stop renewal. */
|
|
20
|
+
export class SharedKeyError extends Error {
|
|
21
|
+
code;
|
|
22
|
+
constructor(code, message) {
|
|
23
|
+
super(message);
|
|
24
|
+
this.code = code;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/** The bytes the identity key signs: the nonce, the host and the server, so a signature is good for one exchange only. */
|
|
28
|
+
export const signedExchange = (nonce, hostId, server) => new TextEncoder().encode(`dsh-teamwork shared host\n${nonce}\n${hostId}\n${server}`);
|
|
29
|
+
export class SharedMode {
|
|
30
|
+
options;
|
|
31
|
+
key;
|
|
32
|
+
state = {};
|
|
33
|
+
timer;
|
|
34
|
+
generation = 0;
|
|
35
|
+
constructor(options) {
|
|
36
|
+
this.options = options;
|
|
37
|
+
}
|
|
38
|
+
get enabled() { return this.key !== undefined; }
|
|
39
|
+
status() { return { enabled: this.enabled, ...this.state }; }
|
|
40
|
+
/** Resumes shared mode from the saved key, if there is one. A refused key stays saved, so the status says why. */
|
|
41
|
+
async restore() {
|
|
42
|
+
let saved;
|
|
43
|
+
try {
|
|
44
|
+
saved = fileSchema.parse(JSON.parse(await readFile(this.options.path, 'utf8'))).key;
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
if (error.code === 'ENOENT')
|
|
48
|
+
return;
|
|
49
|
+
throw error;
|
|
50
|
+
}
|
|
51
|
+
this.key = saved;
|
|
52
|
+
await this.renew(++this.generation).catch(() => { });
|
|
53
|
+
}
|
|
54
|
+
/** Turns shared mode on with a key: it is saved only once the server accepts it for this machine. */
|
|
55
|
+
async enable(input) {
|
|
56
|
+
const key = input.trim();
|
|
57
|
+
if (!KEY.test(key))
|
|
58
|
+
throw new SharedKeyError('format', 'That is not a team host key. Copy it again from the team console.');
|
|
59
|
+
const generation = ++this.generation;
|
|
60
|
+
this.stopTimer();
|
|
61
|
+
const previous = this.key;
|
|
62
|
+
this.key = key;
|
|
63
|
+
try {
|
|
64
|
+
await this.renew(generation);
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
this.key = previous;
|
|
68
|
+
throw error;
|
|
69
|
+
}
|
|
70
|
+
await mkdir(dirname(this.options.path), { recursive: true, mode: 0o700 });
|
|
71
|
+
const temporary = `${this.options.path}.${randomBytes(8).toString('hex')}.tmp`;
|
|
72
|
+
try {
|
|
73
|
+
await writeFile(temporary, JSON.stringify({ key }), { mode: 0o600 });
|
|
74
|
+
await rename(temporary, this.options.path);
|
|
75
|
+
}
|
|
76
|
+
finally {
|
|
77
|
+
await rm(temporary, { force: true });
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
/** Turns shared mode off: the key is deleted and the host token dropped. */
|
|
81
|
+
async disable() {
|
|
82
|
+
this.generation++;
|
|
83
|
+
this.stopTimer();
|
|
84
|
+
this.key = undefined;
|
|
85
|
+
this.state = {};
|
|
86
|
+
await rm(this.options.path, { force: true });
|
|
87
|
+
await this.options.onToken(undefined);
|
|
88
|
+
}
|
|
89
|
+
stop() { this.generation++; this.stopTimer(); }
|
|
90
|
+
stopTimer() { if (this.timer)
|
|
91
|
+
clearTimeout(this.timer); this.timer = undefined; }
|
|
92
|
+
schedule(generation, delay) {
|
|
93
|
+
this.stopTimer();
|
|
94
|
+
this.timer = setTimeout(() => { void this.renew(generation).catch(() => { }); }, Math.max(1000, delay));
|
|
95
|
+
this.timer.unref?.();
|
|
96
|
+
}
|
|
97
|
+
async renew(generation) {
|
|
98
|
+
const key = this.key;
|
|
99
|
+
if (!key || generation !== this.generation)
|
|
100
|
+
return;
|
|
101
|
+
const hostId = KEY.exec(key)[1];
|
|
102
|
+
try {
|
|
103
|
+
const issued = await this.exchange(key, hostId);
|
|
104
|
+
if (generation !== this.generation)
|
|
105
|
+
return;
|
|
106
|
+
this.state = { hostId: issued.hostId, teamId: issued.teamId, name: issued.name, expiresAt: issued.expiresAt };
|
|
107
|
+
await this.options.onToken(issued.token);
|
|
108
|
+
const now = this.options.now?.() ?? Date.now();
|
|
109
|
+
this.schedule(generation, Date.parse(issued.expiresAt) - now - RENEW_BEFORE_MS);
|
|
110
|
+
}
|
|
111
|
+
catch (error) {
|
|
112
|
+
if (generation !== this.generation)
|
|
113
|
+
return;
|
|
114
|
+
const failure = error instanceof SharedKeyError ? error : new SharedKeyError('unavailable', 'The Teamwork server could not be reached. Retrying in a minute.');
|
|
115
|
+
this.state = { ...this.state, error: failure.message };
|
|
116
|
+
this.options.log?.(`shared mode: ${failure.message}`);
|
|
117
|
+
if (failure.code === 'unavailable')
|
|
118
|
+
this.schedule(generation, RETRY_MS);
|
|
119
|
+
else
|
|
120
|
+
await this.options.onToken(undefined);
|
|
121
|
+
throw failure;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
async exchange(key, hostId) {
|
|
125
|
+
const server = this.options.server(), request = this.options.request ?? fetch;
|
|
126
|
+
const post = (path, body) => request(`${server}/relay/shared/${path}`, {
|
|
127
|
+
method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body), signal: AbortSignal.timeout(15000), redirect: 'error',
|
|
128
|
+
});
|
|
129
|
+
const challenge = await post('challenge', { key });
|
|
130
|
+
if (challenge.status === 404)
|
|
131
|
+
throw new SharedKeyError('invalid', 'This Teamwork server does not offer shared DSHs.');
|
|
132
|
+
if (!challenge.ok)
|
|
133
|
+
throw new SharedKeyError(challenge.status === 400 ? 'format' : 'unavailable', 'The Teamwork server refused the challenge.');
|
|
134
|
+
const { nonce } = challengeSchema.parse(await challenge.json());
|
|
135
|
+
const identity = await this.options.identity();
|
|
136
|
+
const signature = await identity.privateKey.sign(signedExchange(nonce, hostId, server));
|
|
137
|
+
const response = await post('token', {
|
|
138
|
+
key, nonce,
|
|
139
|
+
publicKey: Buffer.from(identity.privateKey.publicKey.raw).toString('base64'),
|
|
140
|
+
signature: Buffer.from(signature).toString('base64'),
|
|
141
|
+
});
|
|
142
|
+
if (response.status === 401)
|
|
143
|
+
throw new SharedKeyError('invalid', 'The team host key is not valid: it was rotated, deleted, or mistyped. Ask a team admin for the current key.');
|
|
144
|
+
if (response.status === 403)
|
|
145
|
+
throw new SharedKeyError('elsewhere', 'This team host key is already used by another machine. Ask a team admin to create a new key for this one.');
|
|
146
|
+
if (!response.ok)
|
|
147
|
+
throw new SharedKeyError('unavailable', 'The Teamwork server could not issue a host token.');
|
|
148
|
+
return tokenSchema.parse(await response.json());
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=shared-mode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared-mode.js","sourceRoot":"","sources":["../src/shared-mode.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,GAAG,GAAG,2CAA2C,CAAC;AACxD,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAC5D,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACxE,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC5I,gGAAgG;AAChG,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACvC,MAAM,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC;AAE3B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;AAEpG,yHAAyH;AACzH,MAAM,OAAO,cAAe,SAAQ,KAAK;IAClB;IAArB,YAAqB,IAAwD,EAAE,OAAe;QAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAA5F,SAAI,GAAJ,IAAI,CAAoD;IAAqC,CAAC;CACpH;AAED,0HAA0H;AAC1H,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,MAAc,EAAE,MAAc,EAAE,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,6BAA6B,KAAK,KAAK,MAAM,KAAK,MAAM,EAAE,CAAC,CAAC;AAgBtK,MAAM,OAAO,UAAU;IAKQ;IAJrB,GAAG,CAAU;IACb,KAAK,GAAkC,EAAE,CAAC;IAC1C,KAAK,CAAiC;IACtC,UAAU,GAAG,CAAC,CAAC;IACvB,YAA6B,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;IAAG,CAAC;IAE3D,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC;IAChD,MAAM,KAAmB,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAE3E,kHAAkH;IAClH,KAAK,CAAC,OAAO;QACX,IAAI,KAAyB,CAAC;QAC9B,IAAI,CAAC;YAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAAC,CAAC;QAC5F,OAAO,KAAK,EAAE,CAAC;YAAC,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO;YAAC,MAAM,KAAK,CAAC;QAAC,CAAC;QAC9F,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC;QACjB,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAqC,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,qGAAqG;IACrG,KAAK,CAAC,MAAM,CAAC,KAAa;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,cAAc,CAAC,QAAQ,EAAE,mEAAmE,CAAC,CAAC;QAC5H,MAAM,UAAU,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC;QAC1B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC;YAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAAC,CAAC;QACrC,OAAO,KAAK,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC;YAAC,MAAM,KAAK,CAAC;QAAC,CAAC;QACnD,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QAC/E,IAAI,CAAC;YAAC,MAAM,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAAC,MAAM,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,CAAC;gBACjH,CAAC;YAAC,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAAC,CAAC;IACnD,CAAC;IAED,4EAA4E;IAC5E,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;QAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QACtC,MAAM,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAEvC,SAAS,KAAK,IAAI,IAAI,CAAC,KAAK;QAAE,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC;IAEjF,QAAQ,CAAC,UAAkB,EAAE,KAAa;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,UAAkB;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,IAAI,CAAC,GAAG,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU;YAAE,OAAO;QACnD,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAE,CAAC,CAAC,CAAE,CAAC;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAChD,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU;gBAAE,OAAO;YAC3C,IAAI,CAAC,KAAK,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;YAC9G,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YAC/C,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,GAAG,GAAG,eAAe,CAAC,CAAC;QAClF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU;gBAAE,OAAO;YAC3C,MAAM,OAAO,GAAG,KAAK,YAAY,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,cAAc,CAAC,aAAa,EAAE,iEAAiE,CAAC,CAAC;YAC/J,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,gBAAgB,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACtD,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa;gBAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;;gBACnE,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC3C,MAAM,OAAO,CAAC;QAChB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,MAAc;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;QAC9E,MAAM,IAAI,GAAG,CAAC,IAAY,EAAE,IAAa,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,MAAM,iBAAiB,IAAI,EAAE,EAAE;YACtF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO;SACnJ,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACnD,IAAI,SAAS,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,kDAAkD,CAAC,CAAC;QACtH,IAAI,CAAC,SAAS,CAAC,EAAE;YAAE,MAAM,IAAI,cAAc,CAAC,SAAS,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,EAAE,4CAA4C,CAAC,CAAC;QAC/I,MAAM,EAAE,KAAK,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACxF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE;YACnC,GAAG,EAAE,KAAK;YACV,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC5E,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACrD,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,6GAA6G,CAAC,CAAC;QAChL,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;YAAE,MAAM,IAAI,cAAc,CAAC,WAAW,EAAE,2GAA2G,CAAC,CAAC;QAChL,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,MAAM,IAAI,cAAc,CAAC,aAAa,EAAE,mDAAmD,CAAC,CAAC;QAC/G,OAAO,WAAW,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Sessions belong to their starter on a shared DSH (the server's `docs/tech/shared-dsh.md`, "Sessions belong to
|
|
3
|
+
* their starter"). DSH itself attributes nothing to an identity: every client's `$events` sees every session, and any
|
|
4
|
+
* client may answer any question. So the bridge, which knows which member each pairing is, decides here what a call
|
|
5
|
+
* may touch and what an event may reach:
|
|
6
|
+
*
|
|
7
|
+
* - `session/create` records the new session as the member's;
|
|
8
|
+
* - `session/list` keeps the member's own sessions and drops sub-agents, which stay under their parent;
|
|
9
|
+
* - a call or stream that names a session must name one of the member's, else DSH is never asked and the answer is
|
|
10
|
+
* `not_found`;
|
|
11
|
+
* - `$events` items reach a member only for their own sessions, and `$events/result` answers only an event this
|
|
12
|
+
* member was shown;
|
|
13
|
+
* - sessions with no owner (started at this DSH's keyboard, or by the agent itself) are reachable by nobody remotely.
|
|
14
|
+
*
|
|
15
|
+
* A personal computer has no filter: its one member owns everything.
|
|
16
|
+
*/
|
|
17
|
+
const record = (value) => (value && typeof value === 'object' ? value : undefined);
|
|
18
|
+
/** The session a call names, if any: `args.request.sessionId`, or a follow's `address.sessionId`. */
|
|
19
|
+
export function namedSession(body) {
|
|
20
|
+
const request = record(record(record(body)?.args)?.request);
|
|
21
|
+
const id = request?.sessionId ?? record(request?.address)?.sessionId;
|
|
22
|
+
return typeof id === 'string' ? id : undefined;
|
|
23
|
+
}
|
|
24
|
+
/** Calls that act on one session; each must name one the member owns. */
|
|
25
|
+
const SESSION_CALLS = new Set(['session/state', 'session/page', 'session/prompt', 'session/cancel', 'teamwork/selectModel',
|
|
26
|
+
'teamwork/uploadStart', 'teamwork/uploadChunk', 'teamwork/uploadFinish', 'teamwork/uploadCancel', 'userQuestions/answer']);
|
|
27
|
+
/** The session an `$events` item is about: a summary's `sessionId`, an emit's first argument, a question's `agentId`. */
|
|
28
|
+
export function eventSession(item) {
|
|
29
|
+
const value = record(item);
|
|
30
|
+
if (!value)
|
|
31
|
+
return undefined;
|
|
32
|
+
if (typeof value.agentId === 'string')
|
|
33
|
+
return value.agentId;
|
|
34
|
+
const args = Array.isArray(value.args) ? value.args : [];
|
|
35
|
+
const first = args[0];
|
|
36
|
+
if (typeof first === 'string')
|
|
37
|
+
return first;
|
|
38
|
+
const summary = record(first);
|
|
39
|
+
return typeof summary?.sessionId === 'string' ? summary.sessionId : undefined;
|
|
40
|
+
}
|
|
41
|
+
export class OwnerFilter {
|
|
42
|
+
owners;
|
|
43
|
+
memberOf;
|
|
44
|
+
/** Per pairing, the events it was shown that can be answered: event id → session. */
|
|
45
|
+
shown = new Map();
|
|
46
|
+
constructor(owners, memberOf) {
|
|
47
|
+
this.owners = owners;
|
|
48
|
+
this.memberOf = memberOf;
|
|
49
|
+
}
|
|
50
|
+
async owns(pairingId, sessionId) {
|
|
51
|
+
if (!sessionId)
|
|
52
|
+
return false;
|
|
53
|
+
const member = await this.memberOf(pairingId);
|
|
54
|
+
return !!member && (await this.owners.ownerOf(sessionId)) === member;
|
|
55
|
+
}
|
|
56
|
+
/** Whether a call may reach DSH at all. */
|
|
57
|
+
async admitCall(pairingId, method, body) {
|
|
58
|
+
if (!(await this.memberOf(pairingId)))
|
|
59
|
+
return false;
|
|
60
|
+
if (method === '$events/result') {
|
|
61
|
+
const eventId = record(record(body)?.args)?.eventId;
|
|
62
|
+
return typeof eventId === 'string' && this.shown.get(pairingId)?.has(eventId) === true;
|
|
63
|
+
}
|
|
64
|
+
if (SESSION_CALLS.has(method))
|
|
65
|
+
return this.owns(pairingId, namedSession(body));
|
|
66
|
+
if (method === 'teamwork/configuration') {
|
|
67
|
+
const id = namedSession(body);
|
|
68
|
+
return !id || this.owns(pairingId, id);
|
|
69
|
+
}
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
/** What a member is answered: a new session becomes theirs, a list keeps only theirs. */
|
|
73
|
+
async afterCall(pairingId, method, response) {
|
|
74
|
+
const value = record(record(record(response)?.result)?.value);
|
|
75
|
+
if (method === 'session/create' && typeof value?.sessionId === 'string') {
|
|
76
|
+
const member = await this.memberOf(pairingId);
|
|
77
|
+
if (member)
|
|
78
|
+
await this.owners.claim(value.sessionId, member);
|
|
79
|
+
return response;
|
|
80
|
+
}
|
|
81
|
+
if (method === 'session/list' && Array.isArray(value?.items)) {
|
|
82
|
+
const kept = [];
|
|
83
|
+
for (const item of value.items) {
|
|
84
|
+
const entry = record(item);
|
|
85
|
+
const projections = record(record(entry?.projections)?.values);
|
|
86
|
+
if (projections?.subagent)
|
|
87
|
+
continue;
|
|
88
|
+
if (await this.owns(pairingId, typeof entry?.sessionId === 'string' ? entry.sessionId : undefined))
|
|
89
|
+
kept.push(item);
|
|
90
|
+
}
|
|
91
|
+
const result = record(record(response)?.result);
|
|
92
|
+
return { ...record(response), result: { ...result, value: { ...value, items: kept } } };
|
|
93
|
+
}
|
|
94
|
+
return response;
|
|
95
|
+
}
|
|
96
|
+
/** Whether a stream may open: a follow must name the member's own session; `$events` is filtered item by item. */
|
|
97
|
+
async admitOpen(pairingId, endpoint, payload) {
|
|
98
|
+
if (!(await this.memberOf(pairingId)))
|
|
99
|
+
return false;
|
|
100
|
+
if (endpoint === 'session/follow')
|
|
101
|
+
return this.owns(pairingId, namedSession(payload));
|
|
102
|
+
return true;
|
|
103
|
+
}
|
|
104
|
+
/** An `$events` item as the member may see it, or undefined when it is about someone else's session. */
|
|
105
|
+
async eventFor(pairingId, item) {
|
|
106
|
+
const value = record(item);
|
|
107
|
+
if (value?.type === 'ready' || value?.type === 'cancel')
|
|
108
|
+
return item;
|
|
109
|
+
const sessionId = eventSession(item);
|
|
110
|
+
if (!(await this.owns(pairingId, sessionId)))
|
|
111
|
+
return undefined;
|
|
112
|
+
if (value?.type === 'waterfall' && typeof value.eventId === 'string') {
|
|
113
|
+
let shown = this.shown.get(pairingId);
|
|
114
|
+
if (!shown)
|
|
115
|
+
this.shown.set(pairingId, shown = new Map());
|
|
116
|
+
shown.set(value.eventId, sessionId);
|
|
117
|
+
}
|
|
118
|
+
return item;
|
|
119
|
+
}
|
|
120
|
+
drop(pairingId) { this.shown.delete(pairingId); }
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=shared-owner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared-owner.js","sourceRoot":"","sources":["../src/shared-owner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A shared DSH's own roster (the server's `docs/tech/shared-dsh.md`, "Two lists" and "Pairing by invite"): who may act
|
|
3
|
+
* on this DSH, which the server's access list alone never decides. It holds the invites the admin created here, each
|
|
4
|
+
* member's paired devices, and which member started each session. It lives beside the cache
|
|
5
|
+
* (`<cache>.shared-roster.json`, mode 0600) and is written atomically; nothing in it leaves this machine.
|
|
6
|
+
*
|
|
7
|
+
* An invite is a single-use secret for one member, valid for a day. Only its hash is kept. The member's device sends
|
|
8
|
+
* the secret inside the encrypted channel, after pinning this DSH's key from the same invite, so only this DSH reads it.
|
|
9
|
+
*/
|
|
10
|
+
import { createHash, randomBytes, timingSafeEqual } from 'node:crypto';
|
|
11
|
+
import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
|
|
12
|
+
import { dirname } from 'node:path';
|
|
13
|
+
import { z } from 'zod';
|
|
14
|
+
export const INVITE_TTL_MS = 24 * 60 * 60 * 1000;
|
|
15
|
+
const fileSchema = z.object({
|
|
16
|
+
invites: z.record(z.string(), z.object({ userId: z.string(), email: z.string(), secretHash: z.string(), expiresAt: z.number() })),
|
|
17
|
+
/** pairing id → the member whose device it is. */
|
|
18
|
+
devices: z.record(z.string(), z.object({ userId: z.string(), name: z.string() })),
|
|
19
|
+
/** session id → the member who started it. */
|
|
20
|
+
owners: z.record(z.string(), z.string()),
|
|
21
|
+
});
|
|
22
|
+
const empty = () => ({ invites: {}, devices: {}, owners: {} });
|
|
23
|
+
export const sharedRosterPath = (cachePath) => cachePath.replace(/(\.json)?$/, '.shared-roster.json');
|
|
24
|
+
const hash = (secret) => createHash('sha256').update(secret).digest('hex');
|
|
25
|
+
export class SharedRoster {
|
|
26
|
+
path;
|
|
27
|
+
now;
|
|
28
|
+
state;
|
|
29
|
+
writes = Promise.resolve();
|
|
30
|
+
constructor(path, now = Date.now) {
|
|
31
|
+
this.path = path;
|
|
32
|
+
this.now = now;
|
|
33
|
+
}
|
|
34
|
+
load() {
|
|
35
|
+
return (this.state ??= readFile(this.path, 'utf8').then((text) => fileSchema.parse(JSON.parse(text)), (error) => { if (error.code === 'ENOENT')
|
|
36
|
+
return empty(); throw error; }));
|
|
37
|
+
}
|
|
38
|
+
/** One change at a time, saved before the next begins. */
|
|
39
|
+
change(apply) {
|
|
40
|
+
const task = this.writes.catch(() => { }).then(async () => {
|
|
41
|
+
const state = await this.load();
|
|
42
|
+
const result = apply(state);
|
|
43
|
+
await mkdir(dirname(this.path), { recursive: true, mode: 0o700 });
|
|
44
|
+
const temporary = `${this.path}.${randomBytes(8).toString('hex')}.tmp`;
|
|
45
|
+
try {
|
|
46
|
+
await writeFile(temporary, JSON.stringify(state), { mode: 0o600 });
|
|
47
|
+
await rename(temporary, this.path);
|
|
48
|
+
}
|
|
49
|
+
finally {
|
|
50
|
+
await rm(temporary, { force: true });
|
|
51
|
+
}
|
|
52
|
+
return result;
|
|
53
|
+
});
|
|
54
|
+
this.writes = task;
|
|
55
|
+
return task;
|
|
56
|
+
}
|
|
57
|
+
/** A new invite for a member; the secret is returned once and never kept. */
|
|
58
|
+
invite(member) {
|
|
59
|
+
const id = randomBytes(9).toString('base64url'), secret = randomBytes(16).toString('base64url');
|
|
60
|
+
return this.change((state) => {
|
|
61
|
+
for (const [key, old] of Object.entries(state.invites))
|
|
62
|
+
if (old.expiresAt < this.now())
|
|
63
|
+
delete state.invites[key];
|
|
64
|
+
state.invites[id] = { userId: member.userId, email: member.email, secretHash: hash(secret), expiresAt: this.now() + INVITE_TTL_MS };
|
|
65
|
+
return { id, secret, expiresAt: state.invites[id].expiresAt };
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Spends an invite for a device when it is unspent, unexpired, for this member, and the secret matches its hash: the
|
|
70
|
+
* device then belongs to the member. False changes nothing, so a wrong guess cannot spend someone's invite.
|
|
71
|
+
*/
|
|
72
|
+
accept(input) {
|
|
73
|
+
return this.change((state) => {
|
|
74
|
+
const invite = state.invites[input.inviteId];
|
|
75
|
+
if (!invite || invite.expiresAt < this.now() || invite.userId !== input.userId)
|
|
76
|
+
return false;
|
|
77
|
+
const want = Buffer.from(invite.secretHash, 'hex'), got = Buffer.from(hash(input.secret), 'hex');
|
|
78
|
+
if (want.length !== got.length || !timingSafeEqual(want, got))
|
|
79
|
+
return false;
|
|
80
|
+
delete state.invites[input.inviteId];
|
|
81
|
+
state.devices[input.pairingId] = { userId: input.userId, name: input.deviceName };
|
|
82
|
+
return true;
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
/** The member a paired device belongs to. */
|
|
86
|
+
async memberOf(pairingId) { return (await this.load()).devices[pairingId]?.userId; }
|
|
87
|
+
async ownerOf(sessionId) { return (await this.load()).owners[sessionId]; }
|
|
88
|
+
claim(sessionId, userId) { return this.change((state) => { state.owners[sessionId] ??= userId; }); }
|
|
89
|
+
async devices() { return (await this.load()).devices; }
|
|
90
|
+
forgetDevice(pairingId) { return this.change((state) => { delete state.devices[pairingId]; }); }
|
|
91
|
+
/**
|
|
92
|
+
* Keeps only the members the server still lists: their devices stay, everyone else's go, with their unspent
|
|
93
|
+
* invites. Sessions keep their owners, so a member who comes back finds them. Returns the pairings dropped.
|
|
94
|
+
*/
|
|
95
|
+
prune(allowed) {
|
|
96
|
+
return this.change((state) => {
|
|
97
|
+
const dropped = [];
|
|
98
|
+
for (const [pairingId, device] of Object.entries(state.devices))
|
|
99
|
+
if (!allowed.has(device.userId)) {
|
|
100
|
+
delete state.devices[pairingId];
|
|
101
|
+
dropped.push(pairingId);
|
|
102
|
+
}
|
|
103
|
+
for (const [id, invite] of Object.entries(state.invites))
|
|
104
|
+
if (!allowed.has(invite.userId))
|
|
105
|
+
delete state.invites[id];
|
|
106
|
+
return dropped;
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
/** Shared mode ended: the roster goes with it. */
|
|
110
|
+
async clear() { this.state = Promise.resolve(empty()); await rm(this.path, { force: true }); }
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=shared-roster.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared-roster.js","sourceRoot":"","sources":["../src/shared-roster.ts"],"names":[],"mappings":"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"}
|
package/lib/task-session.js
CHANGED
|
@@ -6,7 +6,8 @@ export const taskProjection = {
|
|
|
6
6
|
apply: (state, event) => {
|
|
7
7
|
if (event.type === 'user/message' && event.data.source.kind === 'user') {
|
|
8
8
|
const text = event.data.content.filter(b => b.type === 'text').map(b => b.text).join('\n');
|
|
9
|
-
|
|
9
|
+
// Empty for a message with no text: the phone app titles such a session in its own language.
|
|
10
|
+
return { ...state, task: text.slice(0, 240) };
|
|
10
11
|
}
|
|
11
12
|
if (event.type === 'turn/start')
|
|
12
13
|
return { ...state, turn: event.data.turn, outcome: 'running', failureCode: null };
|
|
@@ -15,29 +16,63 @@ export const taskProjection = {
|
|
|
15
16
|
return state;
|
|
16
17
|
}, wire: { viewSchema: taskSchema, view: state => state }, stateVersion: 1,
|
|
17
18
|
};
|
|
18
|
-
|
|
19
|
+
const stepSchema = z.object({ turn: z.number(), count: z.number(), tool: z.string(), target: z.string() });
|
|
20
|
+
/** The most of a step's target a session summary carries: a path or a command's first line, never a file's contents. */
|
|
21
|
+
const TARGET_CHARS = 120;
|
|
22
|
+
/** What a tool call works on, as the phone's session view names it; '' when its arguments name nothing. */
|
|
23
|
+
export function stepTarget(args) {
|
|
24
|
+
try {
|
|
25
|
+
const parsed = JSON.parse(args);
|
|
26
|
+
if (parsed && typeof parsed === 'object')
|
|
27
|
+
for (const key of ['command', 'path', 'file_path', 'query', 'url', 'description']) {
|
|
28
|
+
const value = parsed[key];
|
|
29
|
+
if (typeof value === 'string')
|
|
30
|
+
return value.split('\n')[0].slice(0, TARGET_CHARS);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
catch { /* Not JSON: nothing worth showing. */ }
|
|
34
|
+
return '';
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* The running turn's progress for the phone's session list: how many tool calls
|
|
38
|
+
* it has made and what the latest works on. A new turn starts at zero and an
|
|
39
|
+
* ended one clears, so an idle session says nothing.
|
|
40
|
+
*/
|
|
41
|
+
export const stepProjection = {
|
|
42
|
+
key: 'teamworkStep', stateSchema: stepSchema, init: () => ({ turn: 0, count: 0, tool: '', target: '' }),
|
|
43
|
+
apply: (state, event) => {
|
|
44
|
+
if (event.type === 'turn/start')
|
|
45
|
+
return { turn: event.data.turn, count: 0, tool: '', target: '' };
|
|
46
|
+
if (event.type === 'tool/call')
|
|
47
|
+
return { ...state, count: state.count + 1, tool: event.data.name.slice(0, 100), target: stepTarget(event.data.arguments) };
|
|
48
|
+
if (event.type === 'turn/end')
|
|
49
|
+
return { ...state, count: 0, tool: '', target: '' };
|
|
50
|
+
return state;
|
|
51
|
+
}, wire: { viewSchema: stepSchema, view: state => state }, stateVersion: 1,
|
|
52
|
+
};
|
|
53
|
+
export function outcomeText(outcome) { return { 'not-started': 'not started', running: 'running', completed: 'completed', aborted: 'cancelled', blocked: 'blocked', error: 'failed', interrupted: 'interrupted before a restart', 'max-tokens': 'hit the output limit', forked: 'inherited from a fork' }[outcome] ?? 'unknown'; }
|
|
19
54
|
export function recoveryHint(code, outcome) {
|
|
20
55
|
if (['AUTH', 'AUTHENTICATION', 'UNAUTHORIZED', 'MISSING_CREDENTIAL'].includes(code ?? ''))
|
|
21
|
-
return '
|
|
56
|
+
return 'Sign-in or credentials are invalid: for a team model run /teamwork login; for a local model check its credentials.';
|
|
22
57
|
if (code === 'RATE_LIMIT')
|
|
23
|
-
return '
|
|
58
|
+
return 'The model is rate limited: continue explicitly later; the task is not repeated automatically.';
|
|
24
59
|
if (code === 'TOOL_ACTIVATION_FAILED')
|
|
25
|
-
return '
|
|
60
|
+
return 'A tool condition is not met: run /teamwork tools and /teamwork plugins to check.';
|
|
26
61
|
if (['TRANSPORT', 'TIMEOUT', 'SERVER'].includes(code ?? ''))
|
|
27
|
-
return '
|
|
62
|
+
return 'The model connection or service failed: check the connection, then continue explicitly; the task may already have done part of its work.';
|
|
28
63
|
if (outcome === 'aborted')
|
|
29
|
-
return '
|
|
64
|
+
return 'The task was cancelled; history and finished file changes stay. Check what is there before continuing.';
|
|
30
65
|
if (outcome === 'error' || outcome === 'blocked' || outcome === 'interrupted')
|
|
31
|
-
return '
|
|
66
|
+
return 'The task did not finish: read the DSH session error, check permissions, tools and existing changes, then continue.';
|
|
32
67
|
if (outcome === 'max-tokens')
|
|
33
|
-
return '
|
|
34
|
-
return '
|
|
68
|
+
return 'The output limit was reached: check the result, then run /teamwork continue <instruction>.';
|
|
69
|
+
return 'To continue, send a new follow-up; files are never rolled back and history is never cleared.';
|
|
35
70
|
}
|
|
36
71
|
export function assertIdle(agent) {
|
|
37
72
|
if (agent.status !== 'idle')
|
|
38
|
-
throw new Error('
|
|
73
|
+
throw new Error('A task is running. Wait for it to finish, or run /teamwork cancel first.');
|
|
39
74
|
if (agent.inbox.nextTurn.length || agent.inbox.nextStep.length)
|
|
40
|
-
throw new Error('
|
|
75
|
+
throw new Error('There is pending input. Check or handle it in DSH’s pending input first, so nothing is submitted twice.');
|
|
41
76
|
}
|
|
42
77
|
export class TaskActions {
|
|
43
78
|
inspect;
|
|
@@ -59,28 +94,28 @@ export class TaskActions {
|
|
|
59
94
|
review(agent, outcome) {
|
|
60
95
|
assertIdle(agent);
|
|
61
96
|
if (!['error', 'aborted', 'blocked', 'interrupted', 'max-tokens'].includes(outcome))
|
|
62
|
-
throw new Error('
|
|
97
|
+
throw new Error('There is no failed or interrupted task to retry. Use /teamwork continue <instruction>.');
|
|
63
98
|
this.tickets.set(agent, { fingerprint: this.fingerprint(agent), expires: this.now() + 120000 });
|
|
64
99
|
}
|
|
65
100
|
async submit(agent, text, retry = false) {
|
|
66
101
|
assertIdle(agent);
|
|
67
102
|
if (this.busy.has(agent))
|
|
68
|
-
throw new Error('
|
|
103
|
+
throw new Error('This session is being checked; do not submit again.');
|
|
69
104
|
if (!text.trim() || text.length > 16000)
|
|
70
|
-
throw new Error('
|
|
105
|
+
throw new Error('Enter a follow-up of 1 to 16000 characters.');
|
|
71
106
|
const cancellation = this.cancellations.get(agent) ?? 0;
|
|
72
107
|
const before = this.fingerprint(agent), ticket = this.tickets.get(agent);
|
|
73
108
|
this.tickets.delete(agent);
|
|
74
109
|
if (retry && (!ticket || ticket.expires < this.now() || ticket.fingerprint !== before))
|
|
75
|
-
throw new Error('
|
|
110
|
+
throw new Error('The retry confirmation expired, or the session configuration changed. Run /teamwork retry again.');
|
|
76
111
|
this.busy.add(agent);
|
|
77
112
|
try {
|
|
78
113
|
await this.inspect(agent);
|
|
79
114
|
assertIdle(agent);
|
|
80
115
|
if ((this.cancellations.get(agent) ?? 0) !== cancellation)
|
|
81
|
-
throw new Error('
|
|
116
|
+
throw new Error('The follow-up was cancelled.');
|
|
82
117
|
if (this.fingerprint(agent) !== before)
|
|
83
|
-
throw new Error('
|
|
118
|
+
throw new Error('The session or team configuration changed during the check. Run /teamwork session, then submit again.');
|
|
84
119
|
agent.followup(createUserMessage({ content: [{ type: 'text', text }], source: { kind: 'user' } }));
|
|
85
120
|
}
|
|
86
121
|
finally {
|
|
@@ -88,5 +123,6 @@ export class TaskActions {
|
|
|
88
123
|
}
|
|
89
124
|
}
|
|
90
125
|
}
|
|
91
|
-
|
|
126
|
+
// Sent to the model as the member's follow-up; it answers in the conversation's own language.
|
|
127
|
+
export const retryInstruction = 'Continue the unfinished task from what this session has already done. First check the actions already taken and the files already changed, so nothing is written, committed or run with side effects twice; ask me before any action you are unsure of.';
|
|
92
128
|
//# sourceMappingURL=task-session.js.map
|
package/lib/task-session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-session.js","sourceRoot":"","sources":["../src/task-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,EAAC,IAAI,EAAC,CAAC,CAAC,MAAM,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,MAAM,EAAE,EAAC,WAAW,EAAC,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAC,IAAI,EAAC,CAAC,CAAC,MAAM,EAAE,EAAC,CAAC,CAAC;AAGpH,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,GAAG,EAAC,cAAc,EAAC,WAAW,EAAC,UAAU,EAAC,IAAI,EAAC,GAAE,EAAE,CAAA,CAAC,EAAC,IAAI,EAAC,EAAE,EAAC,OAAO,EAAC,aAAa,EAAC,WAAW,EAAC,IAAI,EAAC,IAAI,EAAC,CAAC,EAAC,CAAC;IAC5G,KAAK,EAAC,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,IAAG,KAAK,CAAC,IAAI,KAAG,cAAc,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAG,MAAM,EAAE,CAAC;YAClE,MAAM,IAAI,GAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,IAAI,KAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnF,OAAO,EAAC,GAAG,KAAK,EAAC,IAAI,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"task-session.js","sourceRoot":"","sources":["../src/task-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises';
|
|
2
|
+
import { unwatchFile, watchFile } from 'node:fs';
|
|
3
|
+
/**
|
|
4
|
+
* Follows a token file written by the host's supervisor, as on a cloud computer: reads it now, and again whenever
|
|
5
|
+
* it changes, including when it is replaced. `onToken` hears the trimmed contents only when they change; a missing
|
|
6
|
+
* or empty file is no token. Polling (`watchFile`) is used because a supervisor replaces the file atomically,
|
|
7
|
+
* which a directory watch can miss.
|
|
8
|
+
*/
|
|
9
|
+
export function watchTokenFile(path, onToken, onError, intervalMs = 1000) {
|
|
10
|
+
let last = null;
|
|
11
|
+
let flight = Promise.resolve();
|
|
12
|
+
const read = () => {
|
|
13
|
+
flight = flight.then(async () => {
|
|
14
|
+
let token;
|
|
15
|
+
try {
|
|
16
|
+
token = (await readFile(path, 'utf8')).trim() || undefined;
|
|
17
|
+
}
|
|
18
|
+
catch (error) {
|
|
19
|
+
if (error.code !== 'ENOENT')
|
|
20
|
+
onError(error);
|
|
21
|
+
token = undefined;
|
|
22
|
+
}
|
|
23
|
+
if (token === last)
|
|
24
|
+
return;
|
|
25
|
+
last = token;
|
|
26
|
+
await onToken(token);
|
|
27
|
+
}).catch(error => onError(error));
|
|
28
|
+
return flight;
|
|
29
|
+
};
|
|
30
|
+
const listener = () => void read();
|
|
31
|
+
watchFile(path, { interval: intervalMs, persistent: false }, listener);
|
|
32
|
+
return { ready: read(), stop: () => unwatchFile(path, listener) };
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=token-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-file.js","sourceRoot":"","sources":["../src/token-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEjD;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,OAAqD,EAAE,OAA+B,EAAE,UAAU,GAAG,IAAI;IACpJ,IAAI,IAAI,GAA8B,IAAI,CAAC;IAC3C,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC9B,IAAI,KAAyB,CAAC;YAC9B,IAAI,CAAC;gBAAC,KAAK,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;YAAC,CAAC;YACnE,OAAO,KAAK,EAAE,CAAC;gBAAC,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;oBAAE,OAAO,CAAC,KAAc,CAAC,CAAC;gBAAC,KAAK,GAAG,SAAS,CAAC;YAAC,CAAC;YACrH,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO;YAC3B,IAAI,GAAG,KAAK,CAAC;YACb,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,KAAc,CAAC,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;IACnC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,CAAC;IACvE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;AACpE,CAAC"}
|