@cotal-ai/workspace 0.100.1 → 0.101.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/build/Release/darwin-arm64/build.json +20 -0
- package/build/Release/darwin-arm64/process.node +0 -0
- package/build/Release/darwin-x64/build.json +20 -0
- package/build/Release/darwin-x64/process.node +0 -0
- package/build/Release/win32-arm64/build.json +4 -3
- package/build/Release/win32-x64/build.json +4 -3
- package/dist/agent-grants.d.ts +21 -0
- package/dist/agent-grants.d.ts.map +1 -0
- package/dist/agent-grants.js +21 -0
- package/dist/agent-grants.js.map +1 -0
- package/dist/auth-paths.d.ts +34 -0
- package/dist/auth-paths.d.ts.map +1 -1
- package/dist/auth-paths.js +99 -3
- package/dist/auth-paths.js.map +1 -1
- package/dist/broker-display.d.ts +12 -0
- package/dist/broker-display.d.ts.map +1 -1
- package/dist/broker-display.js +14 -0
- package/dist/broker-display.js.map +1 -1
- package/dist/connect.d.ts +21 -7
- package/dist/connect.d.ts.map +1 -1
- package/dist/connect.js +152 -22
- package/dist/connect.js.map +1 -1
- package/dist/control-target.d.ts.map +1 -1
- package/dist/control-target.js +12 -10
- package/dist/control-target.js.map +1 -1
- package/dist/cotal-config.d.ts +7 -0
- package/dist/cotal-config.d.ts.map +1 -1
- package/dist/cotal-config.js +29 -2
- package/dist/cotal-config.js.map +1 -1
- package/dist/cotal-home.d.ts +23 -0
- package/dist/cotal-home.d.ts.map +1 -0
- package/dist/cotal-home.js +36 -0
- package/dist/cotal-home.js.map +1 -0
- package/dist/credential-actions.d.ts +17 -3
- package/dist/credential-actions.d.ts.map +1 -1
- package/dist/credential-actions.js +62 -10
- package/dist/credential-actions.js.map +1 -1
- package/dist/darwin-process.d.ts +20 -0
- package/dist/darwin-process.d.ts.map +1 -0
- package/dist/darwin-process.js +24 -0
- package/dist/darwin-process.js.map +1 -0
- package/dist/deprecated-daemon-entries.d.ts +3 -0
- package/dist/deprecated-daemon-entries.d.ts.map +1 -1
- package/dist/deprecated-daemon-entries.js +6 -1
- package/dist/deprecated-daemon-entries.js.map +1 -1
- package/dist/extensions.d.ts +4 -2
- package/dist/extensions.d.ts.map +1 -1
- package/dist/extensions.js +7 -2
- package/dist/extensions.js.map +1 -1
- package/dist/flags.d.ts +2 -0
- package/dist/flags.d.ts.map +1 -1
- package/dist/flags.js +1 -1
- package/dist/flags.js.map +1 -1
- package/dist/index.d.ts +7 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/join-target.d.ts +3 -1
- package/dist/join-target.d.ts.map +1 -1
- package/dist/join-target.js +15 -3
- package/dist/join-target.js.map +1 -1
- package/dist/maintenance.d.ts +61 -2
- package/dist/maintenance.d.ts.map +1 -1
- package/dist/maintenance.js +153 -14
- package/dist/maintenance.js.map +1 -1
- package/dist/manager-name.d.ts +15 -0
- package/dist/manager-name.d.ts.map +1 -0
- package/dist/manager-name.js +54 -0
- package/dist/manager-name.js.map +1 -0
- package/dist/mesh-registry.d.ts +39 -35
- package/dist/mesh-registry.d.ts.map +1 -1
- package/dist/mesh-registry.js +57 -36
- package/dist/mesh-registry.js.map +1 -1
- package/dist/mesh-target.d.ts +120 -3
- package/dist/mesh-target.d.ts.map +1 -1
- package/dist/mesh-target.js +319 -48
- package/dist/mesh-target.js.map +1 -1
- package/dist/official-connectors.d.ts +3 -0
- package/dist/official-connectors.d.ts.map +1 -1
- package/dist/official-connectors.js +5 -0
- package/dist/official-connectors.js.map +1 -1
- package/dist/output.d.ts +34 -6
- package/dist/output.d.ts.map +1 -1
- package/dist/output.js +38 -5
- package/dist/output.js.map +1 -1
- package/dist/pid.d.ts +42 -7
- package/dist/pid.d.ts.map +1 -1
- package/dist/pid.js +189 -26
- package/dist/pid.js.map +1 -1
- package/dist/preferences.d.ts +25 -3
- package/dist/preferences.d.ts.map +1 -1
- package/dist/preferences.js +77 -14
- package/dist/preferences.js.map +1 -1
- package/dist/preflight.d.ts +17 -5
- package/dist/preflight.d.ts.map +1 -1
- package/dist/preflight.js +22 -32
- package/dist/preflight.js.map +1 -1
- package/dist/prepared-spaces.d.ts +20 -2
- package/dist/prepared-spaces.d.ts.map +1 -1
- package/dist/prepared-spaces.js +90 -15
- package/dist/prepared-spaces.js.map +1 -1
- package/dist/present.d.ts +2 -12
- package/dist/present.d.ts.map +1 -1
- package/dist/present.js +24 -40
- package/dist/present.js.map +1 -1
- package/dist/protected-records.d.ts +22 -3
- package/dist/protected-records.d.ts.map +1 -1
- package/dist/protected-records.js +198 -27
- package/dist/protected-records.js.map +1 -1
- package/dist/registration-policy.d.ts +2 -1
- package/dist/registration-policy.d.ts.map +1 -1
- package/dist/render.d.ts +2 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +42 -11
- package/dist/render.js.map +1 -1
- package/dist/renewal.d.ts +4 -0
- package/dist/renewal.d.ts.map +1 -1
- package/dist/renewal.js +20 -1
- package/dist/renewal.js.map +1 -1
- package/dist/service-adapter.d.ts +1 -2
- package/dist/service-adapter.d.ts.map +1 -1
- package/dist/service-adapter.js +9 -4
- package/dist/service-adapter.js.map +1 -1
- package/dist/service-custody.js +2 -2
- package/dist/service-custody.js.map +1 -1
- package/dist/service-definition.d.ts +3 -0
- package/dist/service-definition.d.ts.map +1 -1
- package/dist/service-definition.js +56 -2
- package/dist/service-definition.js.map +1 -1
- package/dist/service-definition.schema.json +2 -1
- package/dist/service-identity.js +4 -4
- package/dist/service-identity.js.map +1 -1
- package/dist/service-stop.js +3 -3
- package/dist/service-stop.js.map +1 -1
- package/dist/service-target.d.ts.map +1 -1
- package/dist/service-target.js +9 -2
- package/dist/service-target.js.map +1 -1
- package/dist/signer-export.d.ts +1 -0
- package/dist/signer-export.d.ts.map +1 -1
- package/dist/signer-export.js +20 -4
- package/dist/signer-export.js.map +1 -1
- package/dist/space-streams.d.ts +18 -0
- package/dist/space-streams.d.ts.map +1 -0
- package/dist/space-streams.js +41 -0
- package/dist/space-streams.js.map +1 -0
- package/dist/space.d.ts +5 -0
- package/dist/space.d.ts.map +1 -1
- package/dist/space.js +5 -0
- package/dist/space.js.map +1 -1
- package/dist/store-entries.d.ts +6 -0
- package/dist/store-entries.d.ts.map +1 -0
- package/dist/store-entries.js +17 -0
- package/dist/store-entries.js.map +1 -0
- package/dist/system-rotation.d.ts +3 -1
- package/dist/system-rotation.d.ts.map +1 -1
- package/dist/system-rotation.js +19 -4
- package/dist/system-rotation.js.map +1 -1
- package/dist/telemetry.d.ts +4 -3
- package/dist/telemetry.d.ts.map +1 -1
- package/dist/telemetry.js +13 -6
- package/dist/telemetry.js.map +1 -1
- package/dist/text-wrap.d.ts +18 -0
- package/dist/text-wrap.d.ts.map +1 -0
- package/dist/text-wrap.js +60 -0
- package/dist/text-wrap.js.map +1 -0
- package/native/README.md +5 -3
- package/native/darwin-process.c +173 -0
- package/package.json +2 -2
- package/scripts/assert-shipped-natives.mjs +3 -3
- package/scripts/build-native.mjs +39 -25
- package/scripts/native-contract.mjs +36 -16
package/dist/pid.js
CHANGED
|
@@ -19,8 +19,9 @@
|
|
|
19
19
|
*/
|
|
20
20
|
import { spawnSync } from "node:child_process";
|
|
21
21
|
import { nativeWin32CreationToken } from "./win32-process.js";
|
|
22
|
+
import { darwinProcessBinding } from "./darwin-process.js";
|
|
22
23
|
import { randomBytes } from "node:crypto";
|
|
23
|
-
import { existsSync, readFileSync, renameSync, rmSync } from "node:fs";
|
|
24
|
+
import { existsSync, readFileSync, readdirSync, readlinkSync, renameSync, rmSync } from "node:fs";
|
|
24
25
|
import { createPrivateRecord, writePrivateRecord } from "@cotal-ai/core";
|
|
25
26
|
import { acquireLock, processStartToken as posixStartToken } from "./advisory-lock.js";
|
|
26
27
|
/** A Node/POSIX-signalable pid: a positive INTEGER within the signed 32-bit range `process.kill`
|
|
@@ -78,6 +79,146 @@ export function probeLiveness(pid) {
|
|
|
78
79
|
return livenessFromErrno(e.code);
|
|
79
80
|
}
|
|
80
81
|
}
|
|
82
|
+
/** Whether `pid` is stopped by a signal such as SIGSTOP, read from its `/proc` state, or on macOS from
|
|
83
|
+
* its kernel entry. Elsewhere this is `false`, and callers keep their unanswered-broker path. */
|
|
84
|
+
export function processStopped(pid) {
|
|
85
|
+
if (process.platform === "darwin") {
|
|
86
|
+
const native = darwinProcessBinding();
|
|
87
|
+
try {
|
|
88
|
+
return native.processInfo(pid)?.stopped === true;
|
|
89
|
+
}
|
|
90
|
+
catch {
|
|
91
|
+
return false;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
if (process.platform !== "linux")
|
|
95
|
+
return false;
|
|
96
|
+
try {
|
|
97
|
+
const stat = readFileSync(`/proc/${pid}/stat`, "utf8");
|
|
98
|
+
return stat.slice(stat.lastIndexOf(")") + 2, stat.lastIndexOf(")") + 3) === "T";
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
/** The listening sockets a loopback `server` dials, as the `socket:[inode]` links a holder's
|
|
105
|
+
* descriptors show, or `undefined` for a host that is not loopback. An `http:` address without a
|
|
106
|
+
* port is on 80, and any other on 4222. Linux reads `/proc/net/tcp{,6}`. */
|
|
107
|
+
function loopbackListenSockets(server) {
|
|
108
|
+
let host, port;
|
|
109
|
+
try {
|
|
110
|
+
const url = new URL(server.includes("://") ? server : `nats://${server}`);
|
|
111
|
+
host = url.hostname.replace(/^\[|\]$/g, "");
|
|
112
|
+
port = url.port ? Number(url.port) : url.protocol === "http:" ? 80 : 4222;
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
return undefined;
|
|
116
|
+
}
|
|
117
|
+
if (!(host === "localhost" || host === "::1" || /^127\.\d+\.\d+\.\d+$/.test(host)))
|
|
118
|
+
return undefined;
|
|
119
|
+
const sockets = new Set();
|
|
120
|
+
for (const table of ["/proc/net/tcp", "/proc/net/tcp6"]) {
|
|
121
|
+
let text;
|
|
122
|
+
try {
|
|
123
|
+
text = readFileSync(table, "utf8");
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
for (const line of text.split("\n").slice(1)) {
|
|
129
|
+
const field = line.trim().split(/\s+/);
|
|
130
|
+
// `0A` is TCP_LISTEN; the local address ends in the port in hex.
|
|
131
|
+
if (field[3] === "0A" && parseInt(field[1]?.split(":").pop() ?? "", 16) === port && field[9])
|
|
132
|
+
sockets.add(`socket:[${field[9]}]`);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return sockets;
|
|
136
|
+
}
|
|
137
|
+
/** Whether `pid` has a descriptor on one of `sockets`. A process this account cannot read has none. */
|
|
138
|
+
function holdsSocket(pid, sockets) {
|
|
139
|
+
let fds;
|
|
140
|
+
try {
|
|
141
|
+
fds = readdirSync(`/proc/${pid}/fd`);
|
|
142
|
+
}
|
|
143
|
+
catch {
|
|
144
|
+
return false;
|
|
145
|
+
}
|
|
146
|
+
for (const fd of fds) {
|
|
147
|
+
try {
|
|
148
|
+
if (sockets.has(readlinkSync(`/proc/${pid}/fd/${fd}`)))
|
|
149
|
+
return true;
|
|
150
|
+
}
|
|
151
|
+
catch { /* the descriptor closed */ }
|
|
152
|
+
}
|
|
153
|
+
return false;
|
|
154
|
+
}
|
|
155
|
+
/** The stopped process of this account that holds the listening socket a loopback `server` dials,
|
|
156
|
+
* or `undefined`. A stopped broker still takes connections, because the kernel completes them, and
|
|
157
|
+
* never greets, so a dial waits out its whole budget. Linux reads `/proc/net/tcp{,6}` and the
|
|
158
|
+
* stopped processes' descriptors; elsewhere this is `undefined`. */
|
|
159
|
+
export function stoppedLoopbackListener(server) {
|
|
160
|
+
if (process.platform !== "linux")
|
|
161
|
+
return undefined;
|
|
162
|
+
const sockets = loopbackListenSockets(server);
|
|
163
|
+
if (!sockets?.size)
|
|
164
|
+
return undefined;
|
|
165
|
+
for (const entry of readdirSync("/proc")) {
|
|
166
|
+
const pid = parsePid(entry);
|
|
167
|
+
if (pid !== undefined && processStopped(pid) && holdsSocket(pid, sockets))
|
|
168
|
+
return pid;
|
|
169
|
+
}
|
|
170
|
+
return undefined;
|
|
171
|
+
}
|
|
172
|
+
/** Every process of this account that listens where a loopback `server` dials, so a report can name
|
|
173
|
+
* what holds an address. Linux only; elsewhere, and for a host that is not loopback, none. */
|
|
174
|
+
export function loopbackListeners(server) {
|
|
175
|
+
if (process.platform !== "linux")
|
|
176
|
+
return [];
|
|
177
|
+
const sockets = loopbackListenSockets(server);
|
|
178
|
+
if (!sockets?.size)
|
|
179
|
+
return [];
|
|
180
|
+
return readdirSync("/proc").flatMap((entry) => {
|
|
181
|
+
const pid = parsePid(entry);
|
|
182
|
+
return pid !== undefined && holdsSocket(pid, sockets) ? [pid] : [];
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
/** The state, ppid and pgrp fields of `/proc/<pid>/stat`, which follow the parenthesised name, or
|
|
186
|
+
* `undefined` when the process is gone. */
|
|
187
|
+
function statFields(pid) {
|
|
188
|
+
try {
|
|
189
|
+
const stat = readFileSync(`/proc/${pid}/stat`, "utf8");
|
|
190
|
+
return stat.slice(stat.lastIndexOf(")") + 2).split(" ", 3);
|
|
191
|
+
}
|
|
192
|
+
catch {
|
|
193
|
+
return undefined;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
/** The process group `pid` belongs to, or `undefined` when it is gone or this is neither Linux nor
|
|
197
|
+
* macOS. A macOS read that fails throws, so a group stop never narrows to one process unnoticed. */
|
|
198
|
+
export function processGroupOf(pid) {
|
|
199
|
+
if (process.platform === "darwin")
|
|
200
|
+
return darwinProcessBinding().processInfo(pid)?.pgid;
|
|
201
|
+
if (process.platform !== "linux")
|
|
202
|
+
return undefined;
|
|
203
|
+
return parsePid(statFields(pid)?.[2] ?? "");
|
|
204
|
+
}
|
|
205
|
+
/** The live processes in process group `pgid`. A zombie has exited and holds nothing, so it is not
|
|
206
|
+
* one. Linux and macOS; elsewhere none. A macOS read that fails throws rather than read as empty. */
|
|
207
|
+
export function processGroupMembers(pgid) {
|
|
208
|
+
if (process.platform === "darwin") {
|
|
209
|
+
const members = darwinProcessBinding().groupMembers(pgid);
|
|
210
|
+
if (members === undefined)
|
|
211
|
+
throw new Error(`process group ${pgid} is not a readable process group ID`);
|
|
212
|
+
return members;
|
|
213
|
+
}
|
|
214
|
+
if (process.platform !== "linux")
|
|
215
|
+
return [];
|
|
216
|
+
return readdirSync("/proc").flatMap((entry) => {
|
|
217
|
+
const pid = parsePid(entry);
|
|
218
|
+
const fields = pid === undefined ? undefined : statFields(pid);
|
|
219
|
+
return fields && fields[0] !== "Z" && fields[0] !== "X" && parsePid(fields[2] ?? "") === pgid ? [pid] : [];
|
|
220
|
+
});
|
|
221
|
+
}
|
|
81
222
|
/**
|
|
82
223
|
* Read one pid's command line.
|
|
83
224
|
*
|
|
@@ -219,13 +360,34 @@ export function win32ProcessCreationToken(pid, read = nativeWin32CreationToken)
|
|
|
219
360
|
const out = read(pid);
|
|
220
361
|
return typeof out === "string" ? parseWin32CreationToken(out) : undefined;
|
|
221
362
|
}
|
|
222
|
-
/**
|
|
223
|
-
*
|
|
224
|
-
*
|
|
225
|
-
*
|
|
226
|
-
|
|
363
|
+
/**
|
|
364
|
+
* macOS start time in microseconds through the shipped Node-API binding. No subprocess is involved,
|
|
365
|
+
* and the second-precision `ps -o lstart=` text is not used. A process that cannot be read is
|
|
366
|
+
* unverified; a missing binding throws. The binding parameter exercises validation off macOS.
|
|
367
|
+
*/
|
|
368
|
+
export function darwinProcessStartToken(pid, binding = darwinProcessBinding) {
|
|
369
|
+
if (!Number.isInteger(pid) || pid <= 0 || pid > 0x7fffffff)
|
|
370
|
+
return undefined;
|
|
371
|
+
const native = binding();
|
|
372
|
+
let token;
|
|
373
|
+
try {
|
|
374
|
+
token = native.processInfo(pid)?.token;
|
|
375
|
+
}
|
|
376
|
+
catch {
|
|
377
|
+
return undefined;
|
|
378
|
+
}
|
|
379
|
+
return typeof token === "string" && /^\d{1,20}$/.test(token) ? token : undefined;
|
|
380
|
+
}
|
|
381
|
+
/** Identity's start-token reader: Linux uses the same `/proc` implementation as the advisory lock so
|
|
382
|
+
* launch and teardown cannot drift; win32 uses {@link win32ProcessCreationToken} instead of the
|
|
383
|
+
* lock's `undefined`, and macOS {@link darwinProcessStartToken} instead of the lock's second-precision
|
|
384
|
+
* `ps` text. `platform` is a parameter so the win32 and macOS branches are executable elsewhere: a
|
|
385
|
+
* mutation that returns `undefined` there must redden without that kernel. */
|
|
386
|
+
export function identityStartToken(pid, platform = process.platform, win32 = win32ProcessCreationToken, posix = posixStartToken, darwin = darwinProcessStartToken) {
|
|
227
387
|
if (platform === "win32")
|
|
228
388
|
return win32(pid);
|
|
389
|
+
if (platform === "darwin")
|
|
390
|
+
return darwin(pid);
|
|
229
391
|
return posix(pid);
|
|
230
392
|
}
|
|
231
393
|
export function defaultStartToken(pid) {
|
|
@@ -239,6 +401,12 @@ export function identityRecord(pid, tokenAt = defaultStartToken) {
|
|
|
239
401
|
const token = tokenAt(pid);
|
|
240
402
|
return token === undefined ? { pid } : { pid, token };
|
|
241
403
|
}
|
|
404
|
+
/** The reader that verifies a recorded start token. A macOS pin written before the native reader holds
|
|
405
|
+
* `ps -o lstart=` text, which no microsecond token equals, so the default reader verifies it with that
|
|
406
|
+
* same `ps` reader and it keeps the guarantee it was written with. A reader the caller passes is used as given. */
|
|
407
|
+
export function startTokenReaderFor(token, tokenAt = defaultStartToken, platform = process.platform) {
|
|
408
|
+
return tokenAt === defaultStartToken && platform === "darwin" && !/^\d+$/.test(token) ? posixStartToken : tokenAt;
|
|
409
|
+
}
|
|
242
410
|
/**
|
|
243
411
|
* THE identity check a teardown must pass before signalling (#969). This is the "open, verify,
|
|
244
412
|
* terminate" step: verify BEFORE any signal. A record pins a start token; if the pid's CURRENT
|
|
@@ -252,7 +420,7 @@ export function identityRecord(pid, tokenAt = defaultStartToken) {
|
|
|
252
420
|
* process itself gone.
|
|
253
421
|
*/
|
|
254
422
|
export function assertRecordIdentity(record, tokenAt = defaultStartToken) {
|
|
255
|
-
const live = tokenAt(record.pid);
|
|
423
|
+
const live = startTokenReaderFor(record.token, tokenAt)(record.pid);
|
|
256
424
|
if (live === undefined) {
|
|
257
425
|
// Distinguish "cannot look" from "looked and it is gone": the token readers return undefined
|
|
258
426
|
// BOTH when the platform cannot answer and when the process does not exist, and those must not
|
|
@@ -318,17 +486,15 @@ function parsePinLines(raw) {
|
|
|
318
486
|
/** The token of a bridge line for a record in the legacy shape: a pid published with no start token,
|
|
319
487
|
* or an old pidfile that had no pin. The line reads as legacy, never as a torn pairing. */
|
|
320
488
|
const NO_START_TOKEN = "-";
|
|
321
|
-
/** The pin line of the pid the pidfile names right now.
|
|
322
|
-
*
|
|
323
|
-
*
|
|
489
|
+
/** The pin line of the pid the pidfile names right now. The pidfile is read through
|
|
490
|
+
* {@link readPidfile}, so only a missing pidfile is a first start and any other read error throws. A
|
|
491
|
+
* pidfile with no pin at all is a legacy record, so its line carries {@link NO_START_TOKEN} and the
|
|
492
|
+
* bridge keeps it legacy. A pin that is unreadable or has no line for that pid has nothing to carry. */
|
|
324
493
|
function currentPinLine(pidfilePath) {
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
current = parsePid(readFileSync(pidfilePath, "utf8"));
|
|
328
|
-
}
|
|
329
|
-
catch {
|
|
494
|
+
const raw = readPidfile(pidfilePath);
|
|
495
|
+
if (raw === undefined)
|
|
330
496
|
return undefined; // no pidfile: a first start, there is no old line to carry
|
|
331
|
-
|
|
497
|
+
const current = parsePid(raw);
|
|
332
498
|
if (current === undefined)
|
|
333
499
|
return undefined;
|
|
334
500
|
let rawPin;
|
|
@@ -394,7 +560,9 @@ function sleepSync(ms) {
|
|
|
394
560
|
* line. After `publish-pin`, the NEW complete record. No state is torn and none drops to the unpinned
|
|
395
561
|
* legacy shape. A legacy old record (a pidfile with no pin) is carried as a {@link NO_START_TOKEN}
|
|
396
562
|
* line, so it stays legacy until the commit. An old pin that is torn or has no line for the old pid
|
|
397
|
-
* has nothing to carry, so until the commit it refuses as a torn pairing, as it already did.
|
|
563
|
+
* has nothing to carry, so until the commit it refuses as a torn pairing, as it already did. A
|
|
564
|
+
* pidfile that exists but cannot be read is not a first start: the publish throws before its first
|
|
565
|
+
* rename, leaving the record as it was.
|
|
398
566
|
*
|
|
399
567
|
* When `identityRecord` cannot establish a token (ps-less host, or a pid whose start could not be
|
|
400
568
|
* read - same rule as {@link writeIdentityPin}), the new line carries {@link NO_START_TOKEN} and
|
|
@@ -465,6 +633,7 @@ export function writePidPair(pidfilePath, pid, opts = {}) {
|
|
|
465
633
|
/**
|
|
466
634
|
* THE open-verify step every teardown runs BEFORE signalling (#969). Read the pidfile's bare pid,
|
|
467
635
|
* then the sibling pin, and adjudicate the pairing:
|
|
636
|
+
* - no-pid -> no pid is recorded, so there is no process to verify or signal
|
|
468
637
|
* - legacy -> the caller warns and signals for upgrade compatibility
|
|
469
638
|
* - match -> safe to signal; the process behind the pid is the recorded one
|
|
470
639
|
* - gone -> ESRCH-proven dead; the caller may clear the record
|
|
@@ -475,16 +644,10 @@ export function writePidPair(pidfilePath, pid, opts = {}) {
|
|
|
475
644
|
* from it here so the pairing check cannot drift from however the caller read the pid.
|
|
476
645
|
*/
|
|
477
646
|
export function verifyIdentityPin(pidfilePath, tokenAt = defaultStartToken) {
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
rawPid = readFileSync(pidfilePath, "utf8");
|
|
481
|
-
}
|
|
482
|
-
catch {
|
|
483
|
-
return { kind: "legacy" }; // no pidfile at all: nothing is pinned; callers treat as absent
|
|
484
|
-
}
|
|
485
|
-
const pidRead = parsePid(rawPid);
|
|
647
|
+
const rawPid = readPidfile(pidfilePath);
|
|
648
|
+
const pidRead = rawPid === undefined ? undefined : parsePid(rawPid);
|
|
486
649
|
if (pidRead === undefined)
|
|
487
|
-
return { kind: "
|
|
650
|
+
return { kind: "no-pid" };
|
|
488
651
|
let rawPin;
|
|
489
652
|
try {
|
|
490
653
|
rawPin = readFileSync(identityPinPath(pidfilePath), "utf8");
|
package/dist/pid.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pid.js","sourceRoot":"","sources":["../src/pid.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pid.js","sourceRoot":"","sources":["../src/pid.ts"],"names":[],"mappings":"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"}
|
package/dist/preferences.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type OutputWarning } from "./output.js";
|
|
1
2
|
/**
|
|
2
3
|
* Personal workstation preferences: defaults a person sets for their own commands, saved for the
|
|
3
4
|
* user and optionally per space. They never hold credentials, and they change future commands, not
|
|
@@ -23,6 +24,8 @@ export interface ResolvedPreference {
|
|
|
23
24
|
/** Every other layer that also set the key, highest first. */
|
|
24
25
|
readonly shadowed: readonly PreferenceLayer[];
|
|
25
26
|
}
|
|
27
|
+
/** The values `color` takes. */
|
|
28
|
+
export declare const COLOR_VALUES: readonly ["auto", "always", "never"];
|
|
26
29
|
/** A detach key spelled `ctrl-<char>` or `^<char>`: a letter, or one of `@ [ \ ] ^ _`. */
|
|
27
30
|
export declare function parseDetachKey(spec: string): {
|
|
28
31
|
byte: number;
|
|
@@ -49,9 +52,23 @@ export interface Preferences {
|
|
|
49
52
|
export declare function preferencesPath(): string;
|
|
50
53
|
/** Why a space name cannot hold preferences, or undefined. */
|
|
51
54
|
export declare function preferenceSpaceProblem(space: string): string | undefined;
|
|
55
|
+
/** Refuse a preferences write into a folder another local account could write, by the rule every
|
|
56
|
+
* protected path follows (see {@link protectedLocalDirectory}): that account could replace the file,
|
|
57
|
+
* and `editor` runs as a shell command. A folder not made yet is checked from the nearest one above
|
|
58
|
+
* it that exists. */
|
|
59
|
+
export declare function assertPreferencesFolderProtected(): void;
|
|
60
|
+
/** The warning a command gives when the preferences file it read sits in a folder another local
|
|
61
|
+
* account could write, and the change that fixes the folder; undefined when there is no file or the
|
|
62
|
+
* folder is protected. The saved values still apply, and a write is refused (see
|
|
63
|
+
* {@link assertPreferencesFolderProtected}). */
|
|
64
|
+
export declare function preferencesFolderWarning(): {
|
|
65
|
+
warning: OutputWarning;
|
|
66
|
+
remedy: string;
|
|
67
|
+
} | undefined;
|
|
52
68
|
/** The saved preferences. A missing file is no preferences at revision 0; a file that does not
|
|
53
69
|
* validate refuses with `SCHEMA_INVALID`, and is never reset. A linked file refuses with
|
|
54
|
-
* `PERMISSION_DENIED` (see {@link assertPreferencesNotLinked})
|
|
70
|
+
* `PERMISSION_DENIED` (see {@link assertPreferencesNotLinked}), and so does a FIFO or another file
|
|
71
|
+
* that is not regular (see {@link assertPreferencesRegular}). */
|
|
55
72
|
export declare function readPreferences(): Preferences;
|
|
56
73
|
/** Where a write goes: the user's defaults, or one space's personal overrides. */
|
|
57
74
|
export type PreferenceScope = {
|
|
@@ -63,14 +80,19 @@ export declare function preferenceValueProblem(key: string, value: string): stri
|
|
|
63
80
|
* Set (`value` a string) or clear (`value` undefined) one key in one scope, and report whether the
|
|
64
81
|
* file changed. The write holds the preferences lock, refuses with `CONFLICT` when the file is no
|
|
65
82
|
* longer at `expectedRevision`, and replaces the file atomically, so a concurrent edit is never lost.
|
|
83
|
+
* A folder another local account could write refuses it with `PERMISSION_DENIED` before anything is
|
|
84
|
+
* written (see {@link assertPreferencesFolderProtected}).
|
|
85
|
+
* The new file is private (`0600`); `replacedMode` is the old file's mode when it was another, such as
|
|
86
|
+
* a read-only `0400`, so the caller can say the mode changed.
|
|
66
87
|
*/
|
|
67
88
|
export declare function writePreference(scope: PreferenceScope, key: string, value: string | undefined, expectedRevision: number): {
|
|
68
89
|
changed: boolean;
|
|
69
90
|
revision: number;
|
|
91
|
+
replacedMode?: number;
|
|
70
92
|
};
|
|
71
93
|
/**
|
|
72
|
-
* Clear every value saved for `space`, under the same lock and `expectedRevision` check
|
|
73
|
-
* {@link writePreference}, in one atomic replace. Returns what was removed, empty when the space had none.
|
|
94
|
+
* Clear every value saved for `space`, under the same folder check, lock and `expectedRevision` check
|
|
95
|
+
* as {@link writePreference}, in one atomic replace. Returns what was removed, empty when the space had none.
|
|
74
96
|
*/
|
|
75
97
|
export declare function removeSpacePreferences(space: string, expectedRevision: number): {
|
|
76
98
|
removed: Partial<Record<PreferenceKey, string>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferences.d.ts","sourceRoot":"","sources":["../src/preferences.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preferences.d.ts","sourceRoot":"","sources":["../src/preferences.ts"],"names":[],"mappings":"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"}
|
package/dist/preferences.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync } from "node:fs";
|
|
2
2
|
import { dirname, join } from "node:path";
|
|
3
|
-
import { acquireLock, globalConfigDir, token, writeSecretFileAtomic } from "@cotal-ai/core";
|
|
3
|
+
import { acquireLock, globalConfigDir, token, utf16Problem, writeSecretFileAtomic } from "@cotal-ai/core";
|
|
4
4
|
import { CommandFailure, isCommandFailure } from "./output.js";
|
|
5
|
-
import { localRecordAccess } from "./protected-records.js";
|
|
5
|
+
import { localRecordAccess, protectedLocalDirectory, shellPath } from "./protected-records.js";
|
|
6
6
|
import { DEFAULT_CONNECTOR, OFFICIAL_CONNECTORS } from "./official-connectors.js";
|
|
7
7
|
/**
|
|
8
8
|
* Personal workstation preferences: defaults a person sets for their own commands, saved for the
|
|
@@ -11,7 +11,8 @@ import { DEFAULT_CONNECTOR, OFFICIAL_CONNECTORS } from "./official-connectors.js
|
|
|
11
11
|
* that reads the key uses.
|
|
12
12
|
*/
|
|
13
13
|
export const PREFERENCES_SCHEMA_VERSION = 1;
|
|
14
|
-
|
|
14
|
+
/** The values `color` takes. */
|
|
15
|
+
export const COLOR_VALUES = ["auto", "always", "never"];
|
|
15
16
|
/** A detach key spelled `ctrl-<char>` or `^<char>`: a letter, or one of `@ [ \ ] ^ _`. */
|
|
16
17
|
export function parseDetachKey(spec) {
|
|
17
18
|
const m = /^(?:ctrl-|\^)([a-z@[\\\]^_])$/i.exec(spec.trim());
|
|
@@ -77,7 +78,7 @@ export const PREFERENCE_KEYS = KEYS.map((k) => k.key);
|
|
|
77
78
|
function specOf(key) {
|
|
78
79
|
const spec = KEYS.find((k) => k.key === key);
|
|
79
80
|
if (!spec)
|
|
80
|
-
throw new CommandFailure("refused", "USAGE_INVALID", `unknown preference "${key}"; valid keys: ${PREFERENCE_KEYS.join(", ")}`);
|
|
81
|
+
throw new CommandFailure("refused", "USAGE_INVALID", `unknown preference "${key}"; valid keys: ${PREFERENCE_KEYS.join(", ")}`, { remedy: "run `cotal config` to see each key and its value" });
|
|
81
82
|
return spec;
|
|
82
83
|
}
|
|
83
84
|
/** What `key` means, whether it may be saved per space, and the variables that supply it. */
|
|
@@ -93,6 +94,7 @@ export function preferencesPath() {
|
|
|
93
94
|
const invalid = (problem) => new CommandFailure("refused", "SCHEMA_INVALID", `the preferences file ${preferencesPath()} is invalid: ${problem}`, {
|
|
94
95
|
remedy: `fix or remove ${preferencesPath()}; nothing resets it`,
|
|
95
96
|
});
|
|
97
|
+
const SPACE_NAME_REMEDY = "run `cotal space` for the names of the spaces this machine knows";
|
|
96
98
|
/** Why a space name cannot hold preferences, or undefined. */
|
|
97
99
|
export function preferenceSpaceProblem(space) {
|
|
98
100
|
return space && token(space) === space ? undefined : `"${space}" is not a space name: use letters, digits, - and _`;
|
|
@@ -116,9 +118,14 @@ function checkScope(where, value, perSpaceOnly) {
|
|
|
116
118
|
}
|
|
117
119
|
/** Validate a parsed preferences document. Anything unexpected refuses; nothing is dropped. */
|
|
118
120
|
function parsePreferences(text) {
|
|
121
|
+
const encoding = utf16Problem(text);
|
|
122
|
+
if (encoding)
|
|
123
|
+
throw invalid(`${encoding}; save it as UTF-8`);
|
|
119
124
|
let doc;
|
|
120
125
|
try {
|
|
121
|
-
|
|
126
|
+
// A hand edit on Windows can begin the file with a UTF-8 byte-order mark, which RFC 8259 lets a
|
|
127
|
+
// reader ignore; the next write leaves it out.
|
|
128
|
+
doc = JSON.parse(text.replace(/^\uFEFF/, ""));
|
|
122
129
|
}
|
|
123
130
|
catch (e) {
|
|
124
131
|
throw invalid(`not JSON (${e.message})`);
|
|
@@ -154,13 +161,60 @@ function assertPreferencesNotLinked(path) {
|
|
|
154
161
|
remedy: `replace the link ${path} with a regular copy of the file it names`,
|
|
155
162
|
});
|
|
156
163
|
}
|
|
164
|
+
/** Refuse a preferences write into a folder another local account could write, by the rule every
|
|
165
|
+
* protected path follows (see {@link protectedLocalDirectory}): that account could replace the file,
|
|
166
|
+
* and `editor` runs as a shell command. A folder not made yet is checked from the nearest one above
|
|
167
|
+
* it that exists. */
|
|
168
|
+
export function assertPreferencesFolderProtected() {
|
|
169
|
+
let dir = globalConfigDir();
|
|
170
|
+
while (!lstatSync(dir, { throwIfNoEntry: false }) && dirname(dir) !== dir)
|
|
171
|
+
dir = dirname(dir);
|
|
172
|
+
try {
|
|
173
|
+
protectedLocalDirectory(dir, "the preferences folder");
|
|
174
|
+
}
|
|
175
|
+
catch (e) {
|
|
176
|
+
if (!isCommandFailure(e) || e.code !== "PERMISSION_DENIED")
|
|
177
|
+
throw e;
|
|
178
|
+
throw new CommandFailure(e.outcome, e.code, `${e.message}; nothing was changed`, { remedy: e.remedy, target: e.target });
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
/** The warning a command gives when the preferences file it read sits in a folder another local
|
|
182
|
+
* account could write, and the change that fixes the folder; undefined when there is no file or the
|
|
183
|
+
* folder is protected. The saved values still apply, and a write is refused (see
|
|
184
|
+
* {@link assertPreferencesFolderProtected}). */
|
|
185
|
+
export function preferencesFolderWarning() {
|
|
186
|
+
if (!lstatSync(preferencesPath(), { throwIfNoEntry: false }))
|
|
187
|
+
return undefined;
|
|
188
|
+
try {
|
|
189
|
+
protectedLocalDirectory(globalConfigDir(), "the preferences folder");
|
|
190
|
+
return undefined;
|
|
191
|
+
}
|
|
192
|
+
catch (e) {
|
|
193
|
+
if (!isCommandFailure(e) || e.code !== "PERMISSION_DENIED")
|
|
194
|
+
throw e;
|
|
195
|
+
const remedy = e.remedy ?? `make ${globalConfigDir()} a folder only you can write`;
|
|
196
|
+
return { warning: { code: "PREFERENCES_FOLDER_UNPROTECTED", target: e.target, message: `${e.message}; the saved preferences still apply, and a write to them is refused until this is fixed: ${remedy}` }, remedy };
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
/** Refuse a preferences path that is a FIFO, a device or a folder: opening one would block or fail,
|
|
200
|
+
* and preferences are kept only in a regular file. */
|
|
201
|
+
function assertPreferencesRegular(path) {
|
|
202
|
+
const stat = lstatSync(path, { throwIfNoEntry: false });
|
|
203
|
+
if (stat && !stat.isFile())
|
|
204
|
+
throw new CommandFailure("refused", "PERMISSION_DENIED", `the preferences file ${path} is not a regular file, such as a FIFO or a device; preferences are kept only in a regular file, so nothing was read or changed`, {
|
|
205
|
+
target: { path },
|
|
206
|
+
remedy: `remove ${path}, or replace it with a regular file`,
|
|
207
|
+
});
|
|
208
|
+
}
|
|
157
209
|
/** The saved preferences. A missing file is no preferences at revision 0; a file that does not
|
|
158
210
|
* validate refuses with `SCHEMA_INVALID`, and is never reset. A linked file refuses with
|
|
159
|
-
* `PERMISSION_DENIED` (see {@link assertPreferencesNotLinked})
|
|
211
|
+
* `PERMISSION_DENIED` (see {@link assertPreferencesNotLinked}), and so does a FIFO or another file
|
|
212
|
+
* that is not regular (see {@link assertPreferencesRegular}). */
|
|
160
213
|
export function readPreferences() {
|
|
161
214
|
let text;
|
|
162
215
|
try {
|
|
163
216
|
assertPreferencesNotLinked(preferencesPath());
|
|
217
|
+
assertPreferencesRegular(preferencesPath());
|
|
164
218
|
text = readFileSync(preferencesPath(), "utf8");
|
|
165
219
|
}
|
|
166
220
|
catch (e) {
|
|
@@ -183,22 +237,28 @@ export function preferenceValueProblem(key, value) {
|
|
|
183
237
|
* Set (`value` a string) or clear (`value` undefined) one key in one scope, and report whether the
|
|
184
238
|
* file changed. The write holds the preferences lock, refuses with `CONFLICT` when the file is no
|
|
185
239
|
* longer at `expectedRevision`, and replaces the file atomically, so a concurrent edit is never lost.
|
|
240
|
+
* A folder another local account could write refuses it with `PERMISSION_DENIED` before anything is
|
|
241
|
+
* written (see {@link assertPreferencesFolderProtected}).
|
|
242
|
+
* The new file is private (`0600`); `replacedMode` is the old file's mode when it was another, such as
|
|
243
|
+
* a read-only `0400`, so the caller can say the mode changed.
|
|
186
244
|
*/
|
|
187
245
|
export function writePreference(scope, key, value, expectedRevision) {
|
|
188
246
|
const spec = specOf(key);
|
|
189
247
|
if (scope.space !== undefined) {
|
|
190
248
|
const problem = preferenceSpaceProblem(scope.space);
|
|
191
249
|
if (problem)
|
|
192
|
-
throw new CommandFailure("refused", "USAGE_INVALID", problem);
|
|
250
|
+
throw new CommandFailure("refused", "USAGE_INVALID", problem, { remedy: SPACE_NAME_REMEDY });
|
|
193
251
|
if (!spec.perSpace)
|
|
194
|
-
throw new CommandFailure("refused", "USAGE_INVALID", `${key} has no per-space value; set it for the user
|
|
252
|
+
throw new CommandFailure("refused", "USAGE_INVALID", `${key} has no per-space value; set it for the user`, { remedy: "run it again without --space" });
|
|
195
253
|
}
|
|
196
254
|
if (value !== undefined) {
|
|
197
255
|
const problem = preferenceValueProblem(key, value);
|
|
256
|
+
const space = scope.space === undefined ? "" : ` --space ${scope.space}`;
|
|
198
257
|
if (problem)
|
|
199
|
-
throw new CommandFailure("refused", "USAGE_INVALID", problem);
|
|
258
|
+
throw new CommandFailure("refused", "USAGE_INVALID", problem, { remedy: `give ${key} a value of that form; \`cotal config unset ${key}${space}\` returns it to its default` });
|
|
200
259
|
}
|
|
201
260
|
const dir = globalConfigDir();
|
|
261
|
+
assertPreferencesFolderProtected();
|
|
202
262
|
let lock;
|
|
203
263
|
try {
|
|
204
264
|
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
@@ -210,7 +270,7 @@ export function writePreference(scope, key, value, expectedRevision) {
|
|
|
210
270
|
if (code === "EACCES" || code === "EPERM" || code === "EROFS")
|
|
211
271
|
throw new CommandFailure("refused", "PERMISSION_DENIED", `the preferences folder ${dir} cannot be ${existsSync(dir) ? "written" : "created"} (${code}); nothing was changed`, {
|
|
212
272
|
target: { path: dir },
|
|
213
|
-
remedy: existsSync(dir) ? `make ${dir} writable by you, for example with \`chmod u+w ${dir}\`` : `make ${dirname(dir)} writable by you, or create ${dir} yourself`,
|
|
273
|
+
remedy: existsSync(dir) ? `make ${dir} writable by you, for example with \`chmod u+w ${shellPath(dir)}\`` : `make ${dirname(dir)} writable by you, or create ${dir} yourself`,
|
|
214
274
|
});
|
|
215
275
|
throw e;
|
|
216
276
|
}
|
|
@@ -236,26 +296,29 @@ export function writePreference(scope, key, value, expectedRevision) {
|
|
|
236
296
|
delete spaces[scope.space];
|
|
237
297
|
}
|
|
238
298
|
const next = { schemaVersion: PREFERENCES_SCHEMA_VERSION, revision: current.revision + 1, defaults, spaces };
|
|
299
|
+
const old = localRecordAccess() === "posix" ? lstatSync(preferencesPath(), { throwIfNoEntry: false }) : undefined;
|
|
239
300
|
writeSecretFileAtomic(preferencesPath(), `${JSON.stringify(next, null, 2)}\n`);
|
|
240
301
|
cached = { path: preferencesPath(), prefs: next };
|
|
241
|
-
|
|
302
|
+
const oldMode = old ? old.mode & 0o777 : undefined;
|
|
303
|
+
return { changed: true, revision: next.revision, ...(oldMode !== undefined && oldMode !== 0o600 ? { replacedMode: oldMode } : {}) };
|
|
242
304
|
}
|
|
243
305
|
finally {
|
|
244
306
|
lock.release();
|
|
245
307
|
}
|
|
246
308
|
}
|
|
247
309
|
/**
|
|
248
|
-
* Clear every value saved for `space`, under the same lock and `expectedRevision` check
|
|
249
|
-
* {@link writePreference}, in one atomic replace. Returns what was removed, empty when the space had none.
|
|
310
|
+
* Clear every value saved for `space`, under the same folder check, lock and `expectedRevision` check
|
|
311
|
+
* as {@link writePreference}, in one atomic replace. Returns what was removed, empty when the space had none.
|
|
250
312
|
*/
|
|
251
313
|
export function removeSpacePreferences(space, expectedRevision) {
|
|
252
314
|
const problem = preferenceSpaceProblem(space);
|
|
253
315
|
if (problem)
|
|
254
|
-
throw new CommandFailure("refused", "USAGE_INVALID", problem);
|
|
316
|
+
throw new CommandFailure("refused", "USAGE_INVALID", problem, { remedy: SPACE_NAME_REMEDY });
|
|
255
317
|
// A space with nothing saved needs no write, so no lock and no configuration folder.
|
|
256
318
|
const before = readPreferences();
|
|
257
319
|
if (!Object.keys(before.spaces[space] ?? {}).length)
|
|
258
320
|
return { removed: {}, revision: before.revision };
|
|
321
|
+
assertPreferencesFolderProtected();
|
|
259
322
|
const lock = acquireLock(`${preferencesPath()}.lock`, { label: "a preferences write", waitMs: 10_000 });
|
|
260
323
|
try {
|
|
261
324
|
const current = readPreferences();
|