waterplane 0.1.18 → 0.1.20
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/CHANGELOG.md +36 -0
- package/NOTICES.md +0 -26
- package/README.md +22 -20
- package/SECURITY.md +575 -562
- package/node_modules/@waterplane/shared/dist/exposure.js +0 -1
- package/node_modules/@waterplane/shared/dist/exposure.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/plugin/api.d.ts +2 -2
- package/node_modules/@waterplane/shared/dist/repotwins.d.ts +47 -0
- package/node_modules/@waterplane/shared/dist/repotwins.js +80 -0
- package/node_modules/@waterplane/shared/dist/repotwins.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/wire/repo.d.ts +5 -0
- package/node_modules/@waterplane/shared/dist/wire/repo.js.map +1 -1
- package/node_modules/@waterplane/shared/dist/wire/session/context.d.ts +4 -0
- package/node_modules/@waterplane/shared/dist/wire/session/context.js.map +1 -1
- package/npm-shrinkwrap.json +2 -177
- package/package.json +1 -2
- package/packages/host/dist/agentlogs.d.ts +18 -0
- package/packages/host/dist/agentlogs.js +58 -0
- package/packages/host/dist/agentlogs.js.map +1 -0
- package/packages/host/dist/agents.d.ts +5 -0
- package/packages/host/dist/agents.js +3 -2
- package/packages/host/dist/agents.js.map +1 -1
- package/packages/host/dist/answergate.js +3 -2
- package/packages/host/dist/answergate.js.map +1 -1
- package/packages/host/dist/clisuggest.d.ts +2 -1
- package/packages/host/dist/clisuggest.js +22 -4
- package/packages/host/dist/clisuggest.js.map +1 -1
- package/packages/host/dist/composer.d.ts +6 -0
- package/packages/host/dist/composer.js +7 -1
- package/packages/host/dist/composer.js.map +1 -1
- package/packages/host/dist/ctxlog/ctxagents.d.ts +0 -29
- package/packages/host/dist/ctxlog/ctxagents.js +41 -8
- package/packages/host/dist/ctxlog/ctxagents.js.map +1 -1
- package/packages/host/dist/healthwatch.js +1 -1
- package/packages/host/dist/healthwatch.js.map +1 -1
- package/packages/host/dist/main.js +3 -0
- package/packages/host/dist/main.js.map +1 -1
- package/packages/host/dist/permmode.js +3 -3
- package/packages/host/dist/plugins/pluginregistry.js +3 -1
- package/packages/host/dist/plugins/pluginregistry.js.map +1 -1
- package/packages/host/dist/push.d.ts +3 -2
- package/packages/host/dist/push.js +7 -6
- package/packages/host/dist/push.js.map +1 -1
- package/packages/host/dist/pushsend.d.ts +57 -0
- package/packages/host/dist/pushsend.js +146 -0
- package/packages/host/dist/pushsend.js.map +1 -0
- package/packages/host/dist/question.js +9 -0
- package/packages/host/dist/question.js.map +1 -1
- package/packages/host/dist/render.js +2 -1
- package/packages/host/dist/render.js.map +1 -1
- package/packages/host/dist/reponames.d.ts +26 -0
- package/packages/host/dist/reponames.js +119 -0
- package/packages/host/dist/reponames.js.map +1 -0
- package/packages/host/dist/repos.js +13 -0
- package/packages/host/dist/repos.js.map +1 -1
- package/packages/host/dist/routes/apihost.js +26 -1
- package/packages/host/dist/routes/apihost.js.map +1 -1
- package/packages/host/dist/screenlog.d.ts +5 -0
- package/packages/host/dist/screenlog.js +7 -2
- package/packages/host/dist/screenlog.js.map +1 -1
- package/packages/host/dist/server/intentEvents.js +3 -2
- package/packages/host/dist/server/intentEvents.js.map +1 -1
- package/packages/host/dist/server/sessionEvents.js +10 -9
- package/packages/host/dist/server/sessionEvents.js.map +1 -1
- package/packages/host/dist/sessionSearch.js +3 -1
- package/packages/host/dist/sessionSearch.js.map +1 -1
- package/packages/host/dist/sessions/apiretry.d.ts +14 -0
- package/packages/host/dist/sessions/apiretry.js +28 -2
- package/packages/host/dist/sessions/apiretry.js.map +1 -1
- package/packages/host/dist/sessions/askwatch.js +1 -1
- package/packages/host/dist/sessions/askwatch.js.map +1 -1
- package/packages/host/dist/sessions/core.d.ts +5 -0
- package/packages/host/dist/tokenscan.d.ts +4 -2
- package/packages/host/dist/tokenscan.js +5 -3
- package/packages/host/dist/tokenscan.js.map +1 -1
- package/packages/host/dist/transcript/transcriptparse.js +5 -2
- package/packages/host/dist/transcript/transcriptparse.js.map +1 -1
- package/packages/host/dist/turnagents.d.ts +8 -1
- package/packages/host/dist/turnagents.js +49 -16
- package/packages/host/dist/turnagents.js.map +1 -1
- package/packages/host/package.json +0 -2
- package/packages/web/dist/assets/demo-CbdAM5Ox.js +26 -0
- package/packages/web/dist/assets/index-CF6HCu-P.js +170 -0
- package/packages/web/dist/assets/index-D3OoNfGN.css +1 -0
- package/packages/web/dist/assets/{shared-BsWIJLE-.js → shared-CsHyApn-.js} +11 -11
- package/packages/web/dist/assets/sheets-BwjSEjgB.js +256 -0
- package/packages/web/dist/build-id.txt +1 -1
- package/packages/web/dist/buildstamp.json +1 -1
- package/packages/web/dist/index.html +5 -5
- package/packages/web/dist/sw.js +2 -2
- package/release.json +3 -3
- package/packages/web/dist/assets/demo-BLBaz4G_.js +0 -26
- package/packages/web/dist/assets/index-BrvcQFBj.js +0 -170
- package/packages/web/dist/assets/index-Dx3VHnr3.css +0 -1
- package/packages/web/dist/assets/sheets-C7CXUU6R.js +0 -250
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One Web Push delivery, on `node:crypto` alone: a VAPID key pair (RFC 8292), the payload encrypted
|
|
3
|
+
* to the subscription (RFC 8291, `aes128gcm` from RFC 8188), and the POST to the push service.
|
|
4
|
+
* What to do with a refusal is `push.ts`'s; this file only reports one.
|
|
5
|
+
*/
|
|
6
|
+
import { type KeyObject } from "node:crypto";
|
|
7
|
+
import { type RequestOptions } from "node:https";
|
|
8
|
+
import type { ClientRequest, IncomingMessage } from "node:http";
|
|
9
|
+
export interface PushSubscription {
|
|
10
|
+
endpoint: string;
|
|
11
|
+
keys: {
|
|
12
|
+
p256dh: string;
|
|
13
|
+
auth: string;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
/** Base64url: the 65-byte uncompressed P-256 point, and the 32-byte private scalar. */
|
|
17
|
+
export interface VapidKeys {
|
|
18
|
+
publicKey: string;
|
|
19
|
+
privateKey: string;
|
|
20
|
+
}
|
|
21
|
+
export interface Vapid {
|
|
22
|
+
subject: string;
|
|
23
|
+
publicKey: string;
|
|
24
|
+
signingKey: KeyObject;
|
|
25
|
+
}
|
|
26
|
+
/** Thrown for any answer outside 2xx. Header names are lower case, as node gives them. */
|
|
27
|
+
export declare class PushRefused extends Error {
|
|
28
|
+
readonly statusCode: number;
|
|
29
|
+
readonly headers: Record<string, unknown>;
|
|
30
|
+
constructor(statusCode: number, headers: Record<string, unknown>);
|
|
31
|
+
}
|
|
32
|
+
/** The largest payload that still leaves the body at 4096 bytes: header, tag and the delimiter out. */
|
|
33
|
+
export declare const PUSH_MAX_PLAINTEXT: number;
|
|
34
|
+
export declare function generateVapidKeys(): VapidKeys;
|
|
35
|
+
/** Throws on a contact or key no push service could accept, so a bad one is said once, at boot. */
|
|
36
|
+
export declare function vapidFrom(subject: string, keys: VapidKeys): Vapid;
|
|
37
|
+
/** The `Authorization` value for one push service. `nowMs` is this host's clock. */
|
|
38
|
+
export declare function vapidAuthorization(endpoint: string, vapid: Vapid, nowMs?: number): string;
|
|
39
|
+
/**
|
|
40
|
+
* RFC 8291 §3.4 into RFC 8188 §2: one record, so the delimiter is 0x02 and any padding is zeros after it.
|
|
41
|
+
* `fixed` exists for the RFC's own test vector, which has no padding; a real send always takes a
|
|
42
|
+
* fresh key and salt, and is padded.
|
|
43
|
+
*/
|
|
44
|
+
export declare function encryptPayload(text: string, keys: PushSubscription["keys"], fixed?: {
|
|
45
|
+
privateKey: Buffer;
|
|
46
|
+
salt: Buffer;
|
|
47
|
+
}): Buffer;
|
|
48
|
+
type Post = (url: URL, options: RequestOptions, answer: (res: IncomingMessage) => void) => ClientRequest;
|
|
49
|
+
/** POST `body`; resolves on 2xx, rejects with `PushRefused` otherwise. Settles within `deadlineMs`
|
|
50
|
+
* however slowly the service answers. `post` is `https.request` outside a test. */
|
|
51
|
+
export declare function postPush(url: URL, headers: Record<string, string | number>, body: Buffer, deadlineMs: number, post?: Post): Promise<void>;
|
|
52
|
+
declare function sendNotification(sub: PushSubscription, text: string, vapid: Vapid): Promise<void>;
|
|
53
|
+
/** The one send, held in an object so a test can stand in for the network. */
|
|
54
|
+
export declare const pushTransport: {
|
|
55
|
+
sendNotification: typeof sendNotification;
|
|
56
|
+
};
|
|
57
|
+
export {};
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One Web Push delivery, on `node:crypto` alone: a VAPID key pair (RFC 8292), the payload encrypted
|
|
3
|
+
* to the subscription (RFC 8291, `aes128gcm` from RFC 8188), and the POST to the push service.
|
|
4
|
+
* What to do with a refusal is `push.ts`'s; this file only reports one.
|
|
5
|
+
*/
|
|
6
|
+
import { createECDH, createCipheriv, createPrivateKey, generateKeyPairSync, hkdfSync, randomBytes, sign } from "node:crypto";
|
|
7
|
+
import { request } from "node:https";
|
|
8
|
+
/** Thrown for any answer outside 2xx. Header names are lower case, as node gives them. */
|
|
9
|
+
export class PushRefused extends Error {
|
|
10
|
+
statusCode;
|
|
11
|
+
headers;
|
|
12
|
+
constructor(statusCode, headers) {
|
|
13
|
+
super(`push service answered ${statusCode}`);
|
|
14
|
+
this.statusCode = statusCode;
|
|
15
|
+
this.headers = headers;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
/** One record of RFC 8188; 4096 is what RFC 8291 §4 lets a push service insist on for the whole body. */
|
|
19
|
+
const RECORD_SIZE = 4096;
|
|
20
|
+
const SALT_BYTES = 16;
|
|
21
|
+
const P256_POINT_BYTES = 65;
|
|
22
|
+
const GCM_TAG_BYTES = 16;
|
|
23
|
+
const HEADER_BYTES = SALT_BYTES + 4 + 1 + P256_POINT_BYTES;
|
|
24
|
+
/** The largest payload that still leaves the body at 4096 bytes: header, tag and the delimiter out. */
|
|
25
|
+
export const PUSH_MAX_PLAINTEXT = RECORD_SIZE - HEADER_BYTES - GCM_TAG_BYTES - 1;
|
|
26
|
+
/** Payloads are padded up to a multiple of this, so the push service sees a size class, not a length.
|
|
27
|
+
* `PUSH_FLOOR` in `push.ts` is a multiple of it, so a payload cut to the floor is not padded past it. */
|
|
28
|
+
const PAD_STEP = 256;
|
|
29
|
+
/** RFC 8292 §2 allows up to 24 h; `PUSH_CLOCK_SKEW_MS` in `push.ts` is reasoned from this 12 h. */
|
|
30
|
+
const VAPID_LIFETIME_S = 12 * 3600;
|
|
31
|
+
/** How long a push service may hold a message for a phone that is off: four weeks. */
|
|
32
|
+
const TTL_S = 2_419_200;
|
|
33
|
+
/** The whole send, from opening the socket to the end of the answer. */
|
|
34
|
+
const SEND_DEADLINE_MS = 30_000;
|
|
35
|
+
const b64u = (b) => Buffer.from(b).toString("base64url");
|
|
36
|
+
const unb64u = (s) => Buffer.from(s, "base64url");
|
|
37
|
+
export function generateVapidKeys() {
|
|
38
|
+
const { x, y, d } = generateKeyPairSync("ec", { namedCurve: "P-256" }).privateKey.export({ format: "jwk" });
|
|
39
|
+
return { publicKey: b64u(Buffer.concat([Buffer.from([4]), unb64u(x), unb64u(y)])), privateKey: d };
|
|
40
|
+
}
|
|
41
|
+
/** Throws on a contact or key no push service could accept, so a bad one is said once, at boot. */
|
|
42
|
+
export function vapidFrom(subject, keys) {
|
|
43
|
+
const protocol = new URL(subject).protocol;
|
|
44
|
+
if (protocol !== "https:" && protocol !== "mailto:")
|
|
45
|
+
throw new Error(`VAPID contact must be an https: or mailto: URL, not ${protocol}`);
|
|
46
|
+
const point = unb64u(keys.publicKey);
|
|
47
|
+
if (point.length !== P256_POINT_BYTES || point[0] !== 4)
|
|
48
|
+
throw new Error("VAPID public key is not an uncompressed P-256 point");
|
|
49
|
+
if (unb64u(keys.privateKey).length !== 32)
|
|
50
|
+
throw new Error("VAPID private key is not 32 bytes");
|
|
51
|
+
const signingKey = createPrivateKey({
|
|
52
|
+
format: "jwk",
|
|
53
|
+
key: { kty: "EC", crv: "P-256", d: keys.privateKey, x: b64u(point.subarray(1, 33)), y: b64u(point.subarray(33)) },
|
|
54
|
+
});
|
|
55
|
+
return { subject, publicKey: keys.publicKey, signingKey };
|
|
56
|
+
}
|
|
57
|
+
/** A bad endpoint's own `TypeError` carries the whole URL in `.input`, and its path is a secret. */
|
|
58
|
+
function endpointUrl(endpoint) {
|
|
59
|
+
try {
|
|
60
|
+
return new URL(endpoint);
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
throw Object.assign(new Error("subscription endpoint is not a URL"), { code: "ERR_INVALID_URL" });
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
/** The `Authorization` value for one push service. `nowMs` is this host's clock. */
|
|
67
|
+
export function vapidAuthorization(endpoint, vapid, nowMs = Date.now()) {
|
|
68
|
+
const claims = { aud: endpointUrl(endpoint).origin, exp: Math.floor(nowMs / 1000) + VAPID_LIFETIME_S, sub: vapid.subject };
|
|
69
|
+
const unsigned = `${b64u(JSON.stringify({ typ: "JWT", alg: "ES256" }))}.${b64u(JSON.stringify(claims))}`;
|
|
70
|
+
const signature = sign("sha256", Buffer.from(unsigned), { key: vapid.signingKey, dsaEncoding: "ieee-p1363" });
|
|
71
|
+
return `vapid t=${unsigned}.${b64u(signature)}, k=${vapid.publicKey}`;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* RFC 8291 §3.4 into RFC 8188 §2: one record, so the delimiter is 0x02 and any padding is zeros after it.
|
|
75
|
+
* `fixed` exists for the RFC's own test vector, which has no padding; a real send always takes a
|
|
76
|
+
* fresh key and salt, and is padded.
|
|
77
|
+
*/
|
|
78
|
+
export function encryptPayload(text, keys, fixed) {
|
|
79
|
+
const plain = Buffer.from(text, "utf8");
|
|
80
|
+
if (plain.length > PUSH_MAX_PLAINTEXT)
|
|
81
|
+
throw new Error(`push payload of ${plain.length} bytes is over ${PUSH_MAX_PLAINTEXT}`);
|
|
82
|
+
const uaPublic = unb64u(keys.p256dh);
|
|
83
|
+
const authSecret = unb64u(keys.auth);
|
|
84
|
+
if (uaPublic.length !== P256_POINT_BYTES)
|
|
85
|
+
throw new Error("subscription p256dh is not a P-256 point");
|
|
86
|
+
if (authSecret.length !== 16)
|
|
87
|
+
throw new Error("subscription auth secret is not 16 bytes");
|
|
88
|
+
const ecdh = createECDH("prime256v1");
|
|
89
|
+
if (fixed)
|
|
90
|
+
ecdh.setPrivateKey(fixed.privateKey);
|
|
91
|
+
else
|
|
92
|
+
ecdh.generateKeys();
|
|
93
|
+
const asPublic = ecdh.getPublicKey();
|
|
94
|
+
const salt = fixed?.salt ?? randomBytes(SALT_BYTES);
|
|
95
|
+
const keyInfo = Buffer.concat([Buffer.from("WebPush: info\0"), uaPublic, asPublic]);
|
|
96
|
+
const ikm = Buffer.from(hkdfSync("sha256", ecdh.computeSecret(uaPublic), authSecret, keyInfo, 32));
|
|
97
|
+
const cek = Buffer.from(hkdfSync("sha256", ikm, salt, Buffer.from("Content-Encoding: aes128gcm\0"), 16));
|
|
98
|
+
const nonce = Buffer.from(hkdfSync("sha256", ikm, salt, Buffer.from("Content-Encoding: nonce\0"), 12));
|
|
99
|
+
const cipher = createCipheriv("aes-128-gcm", cek, nonce);
|
|
100
|
+
const padded = fixed ? plain.length : Math.min(PUSH_MAX_PLAINTEXT, Math.ceil(Math.max(plain.length, 1) / PAD_STEP) * PAD_STEP);
|
|
101
|
+
const tail = Buffer.alloc(1 + padded - plain.length);
|
|
102
|
+
tail[0] = 2;
|
|
103
|
+
const sealed = Buffer.concat([cipher.update(plain), cipher.update(tail), cipher.final(), cipher.getAuthTag()]);
|
|
104
|
+
const header = Buffer.alloc(HEADER_BYTES);
|
|
105
|
+
salt.copy(header, 0);
|
|
106
|
+
header.writeUInt32BE(RECORD_SIZE, SALT_BYTES);
|
|
107
|
+
header[SALT_BYTES + 4] = P256_POINT_BYTES;
|
|
108
|
+
asPublic.copy(header, SALT_BYTES + 5);
|
|
109
|
+
return Buffer.concat([header, sealed]);
|
|
110
|
+
}
|
|
111
|
+
/** POST `body`; resolves on 2xx, rejects with `PushRefused` otherwise. Settles within `deadlineMs`
|
|
112
|
+
* however slowly the service answers. `post` is `https.request` outside a test. */
|
|
113
|
+
export function postPush(url, headers, body, deadlineMs, post = request) {
|
|
114
|
+
return new Promise((resolve, reject) => {
|
|
115
|
+
const req = post(url, { method: "POST", headers: { ...headers, "Content-Length": body.length } }, (res) => {
|
|
116
|
+
res.resume();
|
|
117
|
+
res.on("error", reject);
|
|
118
|
+
res.on("end", () => {
|
|
119
|
+
const code = res.statusCode ?? 0;
|
|
120
|
+
if (code >= 200 && code < 300)
|
|
121
|
+
resolve();
|
|
122
|
+
else
|
|
123
|
+
reject(new PushRefused(code, res.headers));
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
const deadline = setTimeout(() => {
|
|
127
|
+
reject(Object.assign(new Error("push service did not answer in time"), { code: "ETIMEDOUT" }));
|
|
128
|
+
req.destroy();
|
|
129
|
+
}, deadlineMs);
|
|
130
|
+
req.on("close", () => clearTimeout(deadline));
|
|
131
|
+
req.on("error", reject);
|
|
132
|
+
req.end(body);
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
function sendNotification(sub, text, vapid) {
|
|
136
|
+
return postPush(endpointUrl(sub.endpoint), {
|
|
137
|
+
Authorization: vapidAuthorization(sub.endpoint, vapid),
|
|
138
|
+
"Content-Encoding": "aes128gcm",
|
|
139
|
+
"Content-Type": "application/octet-stream",
|
|
140
|
+
TTL: TTL_S,
|
|
141
|
+
Urgency: "normal",
|
|
142
|
+
}, encryptPayload(text, sub.keys), SEND_DEADLINE_MS);
|
|
143
|
+
}
|
|
144
|
+
/** The one send, held in an object so a test can stand in for the network. */
|
|
145
|
+
export const pushTransport = { sendNotification };
|
|
146
|
+
//# sourceMappingURL=pushsend.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pushsend.js","sourceRoot":"","sources":["../src/pushsend.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,12 @@ import { composerFrame } from "./permmode.js";
|
|
|
31
31
|
* question window sees the agent's actual closing lines, not the prompt box.
|
|
32
32
|
*/
|
|
33
33
|
const TUI_CHROME = /^(>|❯|│|┃|╭|╰|─|━|⏵|✳|✻|·|\[|🤖)|message or|\/command|auto[- ]?mode|shift\+tab|for agents|bypassing permissions|\? for shortcuts|baked for|\besc\b.*\btab\b|^[\s↑↓←→↵⏎^c]+$/i;
|
|
34
|
+
/**
|
|
35
|
+
* The head of the CLI's own summary of a finished turn. It is printed after the
|
|
36
|
+
* agent's last word and runs down to the composer ("(disable recaps in /config)",
|
|
37
|
+
* "new task? /clear to save…"), so nothing from here down was said to anyone.
|
|
38
|
+
*/
|
|
39
|
+
const RECAP_HEAD = /^※\s*recap:/i;
|
|
34
40
|
/** A row that starts its own item rather than continuing the one above. */
|
|
35
41
|
const ITEM_START = /^([-*•●⏺⎿]|\d+[.)])\s/;
|
|
36
42
|
/** A row that ends a sentence, so the next row is not its wrapped tail. */
|
|
@@ -53,6 +59,9 @@ function contentLines(tail) {
|
|
|
53
59
|
const frame = composerFrame(rows);
|
|
54
60
|
if (frame)
|
|
55
61
|
rows = rows.slice(0, frame.top);
|
|
62
|
+
const recap = rows.findLastIndex((r) => RECAP_HEAD.test(r));
|
|
63
|
+
if (recap >= 0)
|
|
64
|
+
rows = rows.slice(0, recap);
|
|
56
65
|
let end = rows.length;
|
|
57
66
|
while (end > 0 && (!rows[end - 1] || TUI_CHROME.test(rows[end - 1])))
|
|
58
67
|
end--;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"question.js","sourceRoot":"","sources":["../src/question.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"question.js","sourceRoot":"","sources":["../src/question.ts"],"names":[],"mappings":"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"}
|
|
@@ -149,7 +149,8 @@ export function cellRows(term, start, end) {
|
|
|
149
149
|
if (cell.getWidth() > 0)
|
|
150
150
|
lit += cell.isDim() ? " " : cell.getChars() || " ";
|
|
151
151
|
}
|
|
152
|
-
|
|
152
|
+
// `width` too: a narrowed alternate buffer's rows run past it (`gridText`).
|
|
153
|
+
rows.push({ text: line.translateToString(true, 0, width), spans, undimmed: lit.trimEnd() });
|
|
153
154
|
}
|
|
154
155
|
return rows;
|
|
155
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { type RepoTarget } from "@waterplane/shared";
|
|
2
|
+
export declare class RepoNamesStore {
|
|
3
|
+
private path;
|
|
4
|
+
private names;
|
|
5
|
+
constructor(root: string);
|
|
6
|
+
/** The name for the clone whose primary checkout is `primary`, or undefined. */
|
|
7
|
+
of(primary: string): string | undefined;
|
|
8
|
+
/** Store a name, or `null`/empty to go back to the folder's. Refuses in words and stores nothing for a bad one. */
|
|
9
|
+
set(primary: string, raw: unknown): {
|
|
10
|
+
ok: true;
|
|
11
|
+
name: string | null;
|
|
12
|
+
} | {
|
|
13
|
+
ok: false;
|
|
14
|
+
error: string;
|
|
15
|
+
};
|
|
16
|
+
private save;
|
|
17
|
+
}
|
|
18
|
+
export declare function installRepoNames(root: string): void;
|
|
19
|
+
export declare function setRepoNamesStore(store: RepoNamesStore | null): void;
|
|
20
|
+
export declare function repoNamesStore(): RepoNamesStore | null;
|
|
21
|
+
/** The display name for the clone whose primary checkout is `primary` — undefined without a store or a name. */
|
|
22
|
+
export declare function displayNameOf(primary: string): string | undefined;
|
|
23
|
+
/** Called by every scan (`repos.ts`) with the root it walked and what it found. */
|
|
24
|
+
export declare function noteScannedNames(root: string, targets: readonly RepoTarget[]): void;
|
|
25
|
+
/** `title` with its leading folder name replaced by the name the session's repo is shown under; unchanged when nobody gave it one. */
|
|
26
|
+
export declare function shownTitleForCwd(cwd: string, title: string): string;
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The name a person gave a repo to be SHOWN instead of its folder's.
|
|
3
|
+
*
|
|
4
|
+
* - **Display only.** Every id, path, API parameter, allow-list entry and stored key
|
|
5
|
+
* stays on the folder; this store changes what `RepoTarget.displayName` says and what a
|
|
6
|
+
* notification calls the repo, nothing else (`shared/repotwins.ts`).
|
|
7
|
+
* - **A host store, keyed by the clone's PRIMARY checkout (realpath)**, so every device
|
|
8
|
+
* agrees and every worktree of the clone carries the same name (`repos.ts`). Not a file
|
|
9
|
+
* written into the repo: it is this desktop's opinion about a directory.
|
|
10
|
+
* - **Nothing seeds it.** Absent means the folder name; only `set` from a person's tap
|
|
11
|
+
* writes here, and a name that cannot be cleaned is refused in words, stored as nothing.
|
|
12
|
+
* - **Unset is a silent no-op**, as `setupprefs.ts`: a test or a CLI with no store
|
|
13
|
+
* installed sees folder names.
|
|
14
|
+
*/
|
|
15
|
+
import { existsSync, mkdirSync, realpathSync } from "node:fs";
|
|
16
|
+
import { join } from "node:path";
|
|
17
|
+
import { cleanRepoDisplayName, shownTitle } from "@waterplane/shared";
|
|
18
|
+
import { hostStateDir } from "./branddirs.js";
|
|
19
|
+
import { readJsonGuarded, writeJsonAtomic } from "./jsonstore.js";
|
|
20
|
+
const key = (primary) => {
|
|
21
|
+
try {
|
|
22
|
+
return realpathSync(primary);
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
return primary;
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
export class RepoNamesStore {
|
|
29
|
+
path;
|
|
30
|
+
names = {};
|
|
31
|
+
constructor(root) {
|
|
32
|
+
this.path = join(hostStateDir(root), "repo-names.json");
|
|
33
|
+
try {
|
|
34
|
+
if (existsSync(this.path)) {
|
|
35
|
+
const raw = readJsonGuarded(this.path, null);
|
|
36
|
+
if (raw?.names && typeof raw.names === "object" && !Array.isArray(raw.names)) {
|
|
37
|
+
// Cleaned on the way IN too: a hand-edit must not put a multi-line name on a header.
|
|
38
|
+
for (const [k, v] of Object.entries(raw.names)) {
|
|
39
|
+
const c = cleanRepoDisplayName(v);
|
|
40
|
+
if (c.ok && c.value)
|
|
41
|
+
this.names[k] = c.value;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
catch { /* unreadable → folder names everywhere */ }
|
|
47
|
+
}
|
|
48
|
+
/** The name for the clone whose primary checkout is `primary`, or undefined. */
|
|
49
|
+
of(primary) {
|
|
50
|
+
return this.names[primary] ?? this.names[key(primary)];
|
|
51
|
+
}
|
|
52
|
+
/** Store a name, or `null`/empty to go back to the folder's. Refuses in words and stores nothing for a bad one. */
|
|
53
|
+
set(primary, raw) {
|
|
54
|
+
const c = cleanRepoDisplayName(raw);
|
|
55
|
+
if (!c.ok)
|
|
56
|
+
return c;
|
|
57
|
+
const k = key(primary);
|
|
58
|
+
delete this.names[primary];
|
|
59
|
+
if (c.value)
|
|
60
|
+
this.names[k] = c.value;
|
|
61
|
+
else
|
|
62
|
+
delete this.names[k];
|
|
63
|
+
this.save();
|
|
64
|
+
return { ok: true, name: c.value };
|
|
65
|
+
}
|
|
66
|
+
save() {
|
|
67
|
+
try {
|
|
68
|
+
mkdirSync(join(this.path, ".."), { recursive: true });
|
|
69
|
+
writeJsonAtomic(this.path, { names: this.names }, { space: 2 });
|
|
70
|
+
}
|
|
71
|
+
catch { /* a label that could not be persisted is not worth a crash */ }
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
let current = null;
|
|
75
|
+
export function installRepoNames(root) {
|
|
76
|
+
current = new RepoNamesStore(root);
|
|
77
|
+
}
|
|
78
|
+
export function setRepoNamesStore(store) {
|
|
79
|
+
current = store;
|
|
80
|
+
}
|
|
81
|
+
export function repoNamesStore() {
|
|
82
|
+
return current;
|
|
83
|
+
}
|
|
84
|
+
/** The display name for the clone whose primary checkout is `primary` — undefined without a store or a name. */
|
|
85
|
+
export function displayNameOf(primary) {
|
|
86
|
+
return current?.of(primary);
|
|
87
|
+
}
|
|
88
|
+
// ── What a notification calls a repo ──────────────────────────────────────────
|
|
89
|
+
//
|
|
90
|
+
// A push has no listing to read, only a session's cwd and its stored title (which leads with the
|
|
91
|
+
// FOLDER's name). The last scan is remembered here — only the worktrees that carry a shown name —
|
|
92
|
+
// so the title can be reworded at the moment it is SENT. The stored title is never rewritten.
|
|
93
|
+
const noTrailingSlash = (p) => { let e = p.length; while (e > 1 && p[e - 1] === "/")
|
|
94
|
+
e--; return p.slice(0, e); };
|
|
95
|
+
/** The last scan's named worktrees, PER scanned root — a scan of another folder (the Settings code-folder check, a candidate) replaces only its own list. */
|
|
96
|
+
const named = new Map();
|
|
97
|
+
/** Called by every scan (`repos.ts`) with the root it walked and what it found. */
|
|
98
|
+
export function noteScannedNames(root, targets) {
|
|
99
|
+
// The newest scan of a worktree path wins: another root's list (a code folder ABOVE this root
|
|
100
|
+
// reaches the same worktrees) must not keep a name this scan no longer carries.
|
|
101
|
+
const scanned = new Set(targets.map((t) => noTrailingSlash(t.worktreePath)));
|
|
102
|
+
for (const [other, list] of named)
|
|
103
|
+
if (other !== root)
|
|
104
|
+
named.set(other, list.filter((n) => !scanned.has(n.path)));
|
|
105
|
+
named.set(root, targets.filter((t) => t.displayName).map((t) => ({ path: noTrailingSlash(t.worktreePath), repoName: t.repoName, displayName: t.displayName })));
|
|
106
|
+
}
|
|
107
|
+
/** `title` with its leading folder name replaced by the name the session's repo is shown under; unchanged when nobody gave it one. */
|
|
108
|
+
export function shownTitleForCwd(cwd, title) {
|
|
109
|
+
let best = null;
|
|
110
|
+
for (const list of named.values())
|
|
111
|
+
for (const n of list) {
|
|
112
|
+
if (cwd !== n.path && !cwd.startsWith(n.path + "/"))
|
|
113
|
+
continue;
|
|
114
|
+
if (!best || n.path.length > best.path.length)
|
|
115
|
+
best = n;
|
|
116
|
+
}
|
|
117
|
+
return best ? shownTitle(title, best.repoName, best.displayName) : title;
|
|
118
|
+
}
|
|
119
|
+
//# sourceMappingURL=reponames.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reponames.js","sourceRoot":"","sources":["../src/reponames.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { twinWheres } from "@waterplane/shared";
|
|
|
5
5
|
import { RUNNING_IN_WSL, wslMountPath } from "./branddirs.js";
|
|
6
6
|
import { env } from "./env.js";
|
|
7
7
|
import { execFileP as pexec } from "./proc.js";
|
|
8
|
+
import { displayNameOf, noteScannedNames } from "./reponames.js";
|
|
8
9
|
export function targetId(worktreePath) {
|
|
9
10
|
return createHash("sha1").update(worktreePath).digest("hex").slice(0, 10);
|
|
10
11
|
}
|
|
@@ -199,6 +200,18 @@ async function scanTargets(root) {
|
|
|
199
200
|
if (w)
|
|
200
201
|
t.where = w;
|
|
201
202
|
}
|
|
203
|
+
// The name a person gave a clone to be SHOWN as (`reponames.ts`), keyed by its primary
|
|
204
|
+
// checkout and carried by every worktree of it. Display only: `repoName` is untouched.
|
|
205
|
+
const primaryOf = new Map();
|
|
206
|
+
for (const [t, dir] of cloneOf)
|
|
207
|
+
if (t.isPrimary)
|
|
208
|
+
primaryOf.set(dir, t.worktreePath);
|
|
209
|
+
for (const [t, dir] of cloneOf) {
|
|
210
|
+
const n = displayNameOf(primaryOf.get(dir) ?? "");
|
|
211
|
+
if (n)
|
|
212
|
+
t.displayName = n;
|
|
213
|
+
}
|
|
214
|
+
noteScannedNames(root, targets);
|
|
202
215
|
return targets;
|
|
203
216
|
}
|
|
204
217
|
export async function findTarget(root, id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repos.js","sourceRoot":"","sources":["../src/repos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAmB,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"repos.js","sourceRoot":"","sources":["../src/repos.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ import { changedCountsWithin, gitRunningIn } from "../git.js";
|
|
|
19
19
|
import { buildFailedFor, gitFailuresFor } from "../attentionstore.js";
|
|
20
20
|
import { listWriteTargets, setSecret } from "../secrets.js";
|
|
21
21
|
import { setupPrefsStore } from "../setupprefs.js";
|
|
22
|
+
import { repoNamesStore } from "../reponames.js";
|
|
22
23
|
import { askRulesStore } from "../askrules.js";
|
|
23
24
|
import { ASK_RULES_SCOPE, browserOriginRefusal, confirmGate } from "../confirmgate.js";
|
|
24
25
|
import { hostChecks, hostFixes } from "../plugins/setupcontrib.js";
|
|
@@ -341,7 +342,7 @@ export const HOST_ROUTES = [
|
|
|
341
342
|
continue;
|
|
342
343
|
const { files } = await discoverArtifactsAsync(t.worktreePath, { scope, sinceSeconds: since, query, kind: fkind, limit, includeInbox: true });
|
|
343
344
|
for (const f of files)
|
|
344
|
-
hits.push({ repoId: t.id, repoName: t.repoName, branch: t.branch, ...f });
|
|
345
|
+
hits.push({ repoId: t.id, repoName: t.displayName || t.repoName, branch: t.branch, ...f });
|
|
345
346
|
}
|
|
346
347
|
hits.sort((a, b) => b.mtime - a.mtime);
|
|
347
348
|
json(res, { hits: hits.slice(0, limit), truncated: hits.length > limit });
|
|
@@ -503,6 +504,30 @@ export const HOST_ROUTES = [
|
|
|
503
504
|
json(res, r, "error" in r ? 400 : 200);
|
|
504
505
|
return true;
|
|
505
506
|
}),
|
|
507
|
+
// The name a person gave a repo to be SHOWN as. A label only (`reponames.ts`): it is set on
|
|
508
|
+
// the clone's PRIMARY checkout, it moves no id, path or key, and `name: null` (or empty) puts
|
|
509
|
+
// the folder's name back. A bad name is a 400 in words, stored as nothing. Not in `passive.ts`:
|
|
510
|
+
// a passive (kids') token is refused it by default, which is right for a write.
|
|
511
|
+
route("PUT", "/api/repodisplayname", async ({ req, res }, ctx) => {
|
|
512
|
+
const { id, name } = await readJson(req);
|
|
513
|
+
const target = await findTarget(ctx.root, String(id || ""));
|
|
514
|
+
if (!target) {
|
|
515
|
+
json(res, { ok: false, error: "That repo is not on this desktop." }, 404);
|
|
516
|
+
return true;
|
|
517
|
+
}
|
|
518
|
+
if (!target.isPrimary) {
|
|
519
|
+
json(res, { ok: false, error: "A name belongs to the repo — set it on its main checkout, not a worktree." }, 400);
|
|
520
|
+
return true;
|
|
521
|
+
}
|
|
522
|
+
const store = repoNamesStore();
|
|
523
|
+
if (!store) {
|
|
524
|
+
json(res, { ok: false, error: "This desktop keeps no repo names." }, 503);
|
|
525
|
+
return true;
|
|
526
|
+
}
|
|
527
|
+
const r = store.set(target.worktreePath, name);
|
|
528
|
+
json(res, r, r.ok ? 200 : 400);
|
|
529
|
+
return true;
|
|
530
|
+
}),
|
|
506
531
|
// Folders under the root that rescan skipped for having no `.git` — asked by the
|
|
507
532
|
// launcher's rescan button so a folder dragged in is not silently missing.
|
|
508
533
|
route("GET", "/api/plainfolders", async ({ res }, ctx) => {
|