probe-research 0.24.0 → 0.26.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/bin/probe-research.js +48 -34
- package/lib/agent-run.js +29 -6
- package/lib/approval-watch.js +75 -20
- package/lib/setup-check.js +38 -6
- package/package.json +2 -2
package/bin/probe-research.js
CHANGED
|
@@ -281,13 +281,26 @@ function run(cmd, args) {
|
|
|
281
281
|
// stdio inherit is load-bearing: the wizard is INTERACTIVE (arrow-key menu)
|
|
282
282
|
// and opens a browser. Capturing its output would break both.
|
|
283
283
|
const r = spawnSync(cmd, args, { stdio: "inherit", shell: false });
|
|
284
|
-
if (r.error) {
|
|
285
|
-
console.error(`probe-research: could not run ${cmd}: ${r.error.message}`);
|
|
286
|
-
process.exit(1);
|
|
287
|
-
}
|
|
284
|
+
if (r.error) exitWithFailure(`could not run ${cmd}: ${r.error.message}`);
|
|
288
285
|
process.exit(r.status === null ? 1 : r.status);
|
|
289
286
|
}
|
|
290
287
|
|
|
288
|
+
/** Whether a call answers in JSON: `--json` among its own words, before any `--` (as the `probe` shim reads it). */
|
|
289
|
+
function isJsonCall(args) {
|
|
290
|
+
const own = args.includes("--") ? args.slice(0, args.indexOf("--")) : args;
|
|
291
|
+
return own.includes("--json");
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
/**
|
|
295
|
+
* The launcher's own failure, exit 1: its line on stderr, and for a JSON call the answer too (`incomplete`),
|
|
296
|
+
* so an agent's command never ends without one (D97). `args`: what was typed after `npx probe-research`.
|
|
297
|
+
*/
|
|
298
|
+
function exitWithFailure(message, args = process.argv.slice(2)) {
|
|
299
|
+
console.error(`probe-research: ${message}`);
|
|
300
|
+
if (isJsonCall(args)) agentRun.refuse(agentRun.Reason.INCOMPLETE, message, 1);
|
|
301
|
+
process.exit(1);
|
|
302
|
+
}
|
|
303
|
+
|
|
291
304
|
/**
|
|
292
305
|
* The words the launcher itself interprets. Everything else is a CLI command of
|
|
293
306
|
* its own and is forwarded untouched.
|
|
@@ -431,6 +444,14 @@ async function sendUnsupportedPlatform(env) {
|
|
|
431
444
|
await sendLauncherEvent(env, UNSUPPORTED_EVENT);
|
|
432
445
|
}
|
|
433
446
|
|
|
447
|
+
/** Windows asked to install or sign in (plan R17): the words, the event, and for a JSON call the answer; exit 1. */
|
|
448
|
+
async function refuseWindows(args) {
|
|
449
|
+
console.error(UNSUPPORTED_PLATFORM);
|
|
450
|
+
await sendUnsupportedPlatform(process.env);
|
|
451
|
+
if (isJsonCall(args)) agentRun.refuse(agentRun.Reason.INCOMPLETE, UNSUPPORTED_PLATFORM, 1);
|
|
452
|
+
process.exit(1);
|
|
453
|
+
}
|
|
454
|
+
|
|
434
455
|
/** The install prompt's first funnel step (plan D14), sent by the launcher before any CLI exists. */
|
|
435
456
|
const SIGN_IN_STARTED_EVENT = "agent_install.signin_started";
|
|
436
457
|
|
|
@@ -597,11 +618,7 @@ async function main() {
|
|
|
597
618
|
const forwarded = cliArgs(args);
|
|
598
619
|
// FIRST, before any `probe` or uv is looked for: an installed one would
|
|
599
620
|
// otherwise run the install (plan R28).
|
|
600
|
-
if (process.platform === "win32" && isInstallCall(forwarded))
|
|
601
|
-
console.error(UNSUPPORTED_PLATFORM);
|
|
602
|
-
await sendUnsupportedPlatform(process.env);
|
|
603
|
-
process.exit(1);
|
|
604
|
-
}
|
|
621
|
+
if (process.platform === "win32" && isInstallCall(forwarded)) await refuseWindows(args);
|
|
605
622
|
if (signInCodeAt(args) >= 0) console.error(SIGN_IN_CODE_NOTE);
|
|
606
623
|
if (isStatusJson(forwarded) && getProbeCommands().length === 0) {
|
|
607
624
|
// No Probe here: the install prompt's first read (step 1b) answers at once, with no download (D37).
|
|
@@ -609,7 +626,7 @@ async function main() {
|
|
|
609
626
|
// A saved sign-in with no CLI is Probe here too: the CLI first, then its status, never `none` (F4).
|
|
610
627
|
// Windows has no CLI build: a sign-in the SDK saved there is no install to read.
|
|
611
628
|
if (process.platform === "win32" || !signIn.hasSavedSignIn(process.env)) {
|
|
612
|
-
agentRun.
|
|
629
|
+
agentRun.answerRead({ setup: NONE_SETUP }, 0);
|
|
613
630
|
}
|
|
614
631
|
return runAgentCall(await getAgentProbe(startedMs, AgentStep.STATUS), forwarded, startedMs, AgentStep.STATUS);
|
|
615
632
|
}
|
|
@@ -643,10 +660,7 @@ async function main() {
|
|
|
643
660
|
// A repair runs the NEWEST release, never the floor: the floor predates
|
|
644
661
|
// `probe repair`, and would hand the job to a CLI that cannot do it.
|
|
645
662
|
latest = await latestVersion();
|
|
646
|
-
if (!latest)
|
|
647
|
-
console.error(`probe-research: ${REPAIR_NEEDS_NETWORK}`);
|
|
648
|
-
process.exit(1);
|
|
649
|
-
}
|
|
663
|
+
if (!latest) exitWithFailure(REPAIR_NEEDS_NETWORK);
|
|
650
664
|
} else if (has("probe")) {
|
|
651
665
|
const found = installedVersion();
|
|
652
666
|
// A fixed CLI runs at once (plan S8): no manifest read on the way to the browser.
|
|
@@ -692,11 +706,8 @@ async function main() {
|
|
|
692
706
|
}
|
|
693
707
|
|
|
694
708
|
if (process.platform === "win32") {
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
` Install uv: https://docs.astral.sh/uv/getting-started/installation/`,
|
|
698
|
-
);
|
|
699
|
-
process.exit(1);
|
|
709
|
+
exitWithFailure(`needs uv ${UV_MIN} or newer on PATH.\n` +
|
|
710
|
+
" Install uv: https://docs.astral.sh/uv/getting-started/installation/");
|
|
700
711
|
}
|
|
701
712
|
|
|
702
713
|
if (uvOnPath) {
|
|
@@ -863,10 +874,17 @@ async function waitForRunningDownload(startedMs, step, watch = null) {
|
|
|
863
874
|
}
|
|
864
875
|
}
|
|
865
876
|
|
|
866
|
-
/**
|
|
877
|
+
/**
|
|
878
|
+
* Read `watch` and report `stage` (none without a watch). The approval read while Probe still installs is
|
|
879
|
+
* answered at once (PR39b): `downloading` with `approved`, who and the stage's `say`, so the agent says it
|
|
880
|
+
* within seconds and runs the wait again for the install. A denied or expired sign-in stops here (PR39).
|
|
881
|
+
*/
|
|
867
882
|
async function updateWatch(watch, step, stage) {
|
|
868
883
|
if (!watch) return;
|
|
869
|
-
await watch.update(stage)
|
|
884
|
+
if (await watch.update(stage)) {
|
|
885
|
+
await refuseAgent(step, agentRun.Reason.DOWNLOADING, "Probe is still installing: run the same command again.",
|
|
886
|
+
agentRun.EXIT_AGAIN, watch.getRunAgainFacts(stage));
|
|
887
|
+
}
|
|
870
888
|
const again = "run `npx -y probe-research sign-in --json` for a new one.";
|
|
871
889
|
if (watch.status === signIn.ApprovalStatus.DENIED) {
|
|
872
890
|
signIn.clearPending();
|
|
@@ -885,6 +903,7 @@ async function updateWatch(watch, step, stage) {
|
|
|
885
903
|
*/
|
|
886
904
|
async function refuseUnfinished(step, watch, stage, message = "Probe is still downloading: run the same command again.") {
|
|
887
905
|
if (watch && watch.isApproved()) {
|
|
906
|
+
watch.markSaid(stage);
|
|
888
907
|
await refuseAgent(step, agentRun.Reason.DOWNLOADING, "Probe is still installing: run the same command again.",
|
|
889
908
|
agentRun.EXIT_AGAIN, watch.getRunAgainFacts(stage));
|
|
890
909
|
}
|
|
@@ -901,11 +920,7 @@ async function runSignIn(rest, startedMs) {
|
|
|
901
920
|
const deadlineMs = startedMs + agentRun.AGENT_BUDGET_MS;
|
|
902
921
|
const unknown = rest.find((word) => !SIGN_IN_FLAGS.includes(word));
|
|
903
922
|
if (unknown) await refuseAgent(AgentStep.SIGN_IN, agentRun.Reason.INCOMPLETE, `sign-in takes ${SIGN_IN_FLAGS.join(", ")}, not ${unknown}`, 2);
|
|
904
|
-
if (process.platform === "win32")
|
|
905
|
-
console.error(UNSUPPORTED_PLATFORM);
|
|
906
|
-
await sendUnsupportedPlatform(process.env);
|
|
907
|
-
process.exit(1);
|
|
908
|
-
}
|
|
923
|
+
if (process.platform === "win32") await refuseWindows(rest);
|
|
909
924
|
const hosted = signIn.findHostedAgent(process.env);
|
|
910
925
|
if (hosted) {
|
|
911
926
|
await refuseAgent(AgentStep.SIGN_IN, agentRun.Reason.HOSTED_AGENT, `This chat runs in ${hosted}, not on your `
|
|
@@ -956,8 +971,8 @@ async function findDownloadedProbe(done, startedMs, step, watch = null) {
|
|
|
956
971
|
|
|
957
972
|
/**
|
|
958
973
|
* `sign-in --wait`: the CLI polls for the approval and saves it. With no `probe` yet, the download first
|
|
959
|
-
* (within the budget), while the approval is read from the server
|
|
960
|
-
*
|
|
974
|
+
* (within the budget), while the approval is read from the server (PR39): the call that reads it answers at
|
|
975
|
+
* once (PR39b); the next one waits for the install and says each stage as it happens.
|
|
961
976
|
*/
|
|
962
977
|
async function waitForSignIn(json, startedMs) {
|
|
963
978
|
const pending = signIn.loadPending();
|
|
@@ -973,7 +988,7 @@ async function waitForSignIn(json, startedMs) {
|
|
|
973
988
|
const watch = new approval.ApprovalWatch(pending);
|
|
974
989
|
const probe = await getAgentProbe(startedMs, AgentStep.SIGN_IN_WAIT, watch);
|
|
975
990
|
// Read only while it waited for the install: a `probe` already here is handed the sign-in at once.
|
|
976
|
-
if (watch.
|
|
991
|
+
if (watch.hasWatched()) await sayInstalled(watch, startedMs);
|
|
977
992
|
return runAgentCall(probe, ["wizard", "--action", "login", "--pending", ...(json ? ["--json"] : [])], startedMs,
|
|
978
993
|
AgentStep.SIGN_IN_WAIT);
|
|
979
994
|
}
|
|
@@ -982,6 +997,7 @@ async function waitForSignIn(json, startedMs) {
|
|
|
982
997
|
async function sayInstalled(watch, startedMs) {
|
|
983
998
|
await updateWatch(watch, AgentStep.SIGN_IN_WAIT, approval.InstallStage.DONE);
|
|
984
999
|
if (!watch.isApproved() || startedMs + agentRun.AGENT_BUDGET_MS - Date.now() >= APPROVED_RESERVE_MS) return;
|
|
1000
|
+
watch.markSaid(approval.InstallStage.DONE);
|
|
985
1001
|
await refuseAgent(AgentStep.SIGN_IN_WAIT, agentRun.Reason.RUN_AGAIN,
|
|
986
1002
|
"Probe is installed, with too little time left to save the sign-in: run the same command again.",
|
|
987
1003
|
agentRun.EXIT_AGAIN, watch.getRunAgainFacts(approval.InstallStage.DONE));
|
|
@@ -1096,9 +1112,8 @@ function installUv(env, forwarded = []) {
|
|
|
1096
1112
|
}
|
|
1097
1113
|
const uv = failure ? null : getInstalledUvPath(env);
|
|
1098
1114
|
if (!uv) {
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
process.exit(1);
|
|
1115
|
+
exitWithFailure(`${failure || "the uv installer finished, but no uv is where it installs"}.\n Run: ${UV_INSTALL}`,
|
|
1116
|
+
forwarded);
|
|
1102
1117
|
}
|
|
1103
1118
|
return uv;
|
|
1104
1119
|
}
|
|
@@ -1106,6 +1121,5 @@ function installUv(env, forwarded = []) {
|
|
|
1106
1121
|
main().catch((err) => {
|
|
1107
1122
|
// A throw here would exit 0 under an unhandled rejection on some Node builds,
|
|
1108
1123
|
// which reads as success to whatever invoked the launcher.
|
|
1109
|
-
|
|
1110
|
-
process.exit(1);
|
|
1124
|
+
exitWithFailure(String(err && err.message ? err.message : err));
|
|
1111
1125
|
});
|
package/lib/agent-run.js
CHANGED
|
@@ -5,8 +5,9 @@
|
|
|
5
5
|
* deadline, SIGKILL 5 s later, then one JSON line saying to run it again. Never the interactive
|
|
6
6
|
* wizard: a detached group loses the terminal.
|
|
7
7
|
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
8
|
+
* One output rule for every agent command (D97): JSON lines on stdout, the last one the answer. The
|
|
9
|
+
* launcher's own answer is the CLI's `done` event, `{v, event: "done", ok, reason, exit_code, ...}`, its
|
|
10
|
+
* reason from the CLI's closed list (`probe.core.events.AgentInstallReason`): the agent branches on it.
|
|
10
11
|
*/
|
|
11
12
|
|
|
12
13
|
const fs = require("node:fs");
|
|
@@ -35,14 +36,32 @@ const Reason = Object.freeze({
|
|
|
35
36
|
});
|
|
36
37
|
/** Exit statuses: 75 means "run the same command again" (the CLI's `AGENT_EXIT_CODES`). */
|
|
37
38
|
const EXIT_AGAIN = 75;
|
|
39
|
+
/** Every line's `v` (`probe.core.events.SCHEMA_VERSION`). */
|
|
40
|
+
const SCHEMA_VERSION = 1;
|
|
41
|
+
/** A line's `event`: the answer is the CLI's `done` (`probe.core.events.Event`); a line before it, `progress`. */
|
|
42
|
+
const Event = Object.freeze({ DONE: "done", PROGRESS: "progress" });
|
|
38
43
|
|
|
39
|
-
/**
|
|
40
|
-
* `process.stdout` is asynchronous, and `process.exit`
|
|
44
|
+
/** The answer, a `done` event (`say`, the line the agent shows, right after `v` and `event`), on stdout, then
|
|
45
|
+
* exit `code`. Written synchronously: on a macOS pipe `process.stdout` is asynchronous, and `process.exit`
|
|
46
|
+
* would drop the line it still queues. */
|
|
41
47
|
function answer(fields, code) {
|
|
42
|
-
|
|
48
|
+
const say = typeof fields.say === "string" ? { say: fields.say } : {};
|
|
49
|
+
writeLine(JSON.stringify({ v: SCHEMA_VERSION, event: Event.DONE, ...say, ok: code === 0, reason: null, ...fields,
|
|
50
|
+
exit_code: code }));
|
|
43
51
|
process.exit(code);
|
|
44
52
|
}
|
|
45
53
|
|
|
54
|
+
/** A read's answer (`status --json` with no Probe here): one object in the CLI read's own shape, no `event`. */
|
|
55
|
+
function answerRead(fields, code) {
|
|
56
|
+
writeLine(JSON.stringify({ v: SCHEMA_VERSION, ...fields }));
|
|
57
|
+
process.exit(code);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** One `progress` line (`say`: what the agent shows as it comes): never the answer, which stays last. */
|
|
61
|
+
function toProgressLine(fields) {
|
|
62
|
+
return JSON.stringify({ v: SCHEMA_VERSION, event: Event.PROGRESS, ...fields });
|
|
63
|
+
}
|
|
64
|
+
|
|
46
65
|
/** One line on stdout, written before this returns (a full pipe falls back to the stream). */
|
|
47
66
|
function writeLine(text) {
|
|
48
67
|
try {
|
|
@@ -52,7 +71,7 @@ function writeLine(text) {
|
|
|
52
71
|
}
|
|
53
72
|
}
|
|
54
73
|
|
|
55
|
-
/** Exit with `code` after
|
|
74
|
+
/** Exit with `code` after the answer `{ok: false, reason, message}`. */
|
|
56
75
|
function refuse(reason, message, code, extra = {}) {
|
|
57
76
|
answer({ ok: false, reason, message, ...extra }, code);
|
|
58
77
|
}
|
|
@@ -109,10 +128,14 @@ module.exports = {
|
|
|
109
128
|
CLI_MARGIN_MS,
|
|
110
129
|
DEADLINE_ENV,
|
|
111
130
|
EXIT_AGAIN,
|
|
131
|
+
Event,
|
|
112
132
|
KILL_GRACE_MS,
|
|
113
133
|
Reason,
|
|
134
|
+
SCHEMA_VERSION,
|
|
114
135
|
answer,
|
|
136
|
+
answerRead,
|
|
115
137
|
refuse,
|
|
116
138
|
runWithBackstop,
|
|
139
|
+
toProgressLine,
|
|
117
140
|
writeLine,
|
|
118
141
|
};
|
package/lib/approval-watch.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `sign-in --wait` while Probe installs (PR39): the approval read from the server at once and every few
|
|
3
|
-
* seconds
|
|
4
|
-
*
|
|
5
|
-
*
|
|
3
|
+
* seconds. The call that reads it while Probe still installs answers at once (PR39b), so the agent says
|
|
4
|
+
* "You're approved" within seconds; the approval is kept (`approval.json`), so the next call only waits for
|
|
5
|
+
* the install, one JSON line per stage as it happens. Richard's fresh Mac approved at once and heard
|
|
6
|
+
* "waiting for approval" for minutes: the old wait read the approval only through the CLI, after the download.
|
|
6
7
|
*/
|
|
7
8
|
|
|
8
|
-
const
|
|
9
|
+
const fs = require("node:fs");
|
|
10
|
+
const path = require("node:path");
|
|
11
|
+
|
|
12
|
+
const { toProgressLine, writeLine } = require("./agent-run");
|
|
9
13
|
const { DownloadStage } = require("./background-download");
|
|
10
|
-
const { ApprovalStatus, fetchApproval } = require("./sign-in");
|
|
14
|
+
const { ApprovalStatus, fetchApproval, getStateFolder } = require("./sign-in");
|
|
11
15
|
|
|
12
16
|
/** Where Probe's install on this computer is: the download's stages, then done (its `probe` answers). */
|
|
13
17
|
const InstallStage = Object.freeze({ ...DownloadStage, DONE: "done" });
|
|
@@ -17,10 +21,11 @@ const STAGE_WORDS = Object.freeze({
|
|
|
17
21
|
[InstallStage.STARTING]: "Probe is still installing on this computer: starting its service for the first time.",
|
|
18
22
|
[InstallStage.DONE]: "Probe is installed on this computer: done.",
|
|
19
23
|
});
|
|
20
|
-
/** A progress line's `event`: it is never the answer, which stays the last line (and has `ok`). */
|
|
21
|
-
const PROGRESS_EVENT = "progress";
|
|
22
24
|
/** The shortest gap between two reads; the server's poll interval when longer. */
|
|
23
25
|
const MIN_READ_GAP_MS = 2000;
|
|
26
|
+
/** This attempt's approval and the last stage said, kept for its next `sign-in --wait` (0600, no secret). */
|
|
27
|
+
const APPROVAL_NAME = "approval.json";
|
|
28
|
+
const APPROVAL_VERSION = 1;
|
|
24
29
|
/** Answers that never change: not asked again. */
|
|
25
30
|
const SETTLED = Object.freeze([ApprovalStatus.APPROVED, ApprovalStatus.DENIED, ApprovalStatus.EXPIRED,
|
|
26
31
|
ApprovalStatus.ONBOARDING_REQUIRED, ApprovalStatus.UNREADABLE]);
|
|
@@ -36,37 +41,87 @@ function getWaitingSay(pending) {
|
|
|
36
41
|
return `Waiting for your approval in the browser${link}${pending.user_code ? ` (code ${pending.user_code})` : ""}.`;
|
|
37
42
|
}
|
|
38
43
|
|
|
44
|
+
/** The approval an earlier call of this attempt read, or null. */
|
|
45
|
+
function loadApproval(attempt) {
|
|
46
|
+
try {
|
|
47
|
+
const data = JSON.parse(fs.readFileSync(path.join(getStateFolder(), APPROVAL_NAME), "utf8"));
|
|
48
|
+
return data && data.v === APPROVAL_VERSION && attempt && data.attempt === attempt ? data : null;
|
|
49
|
+
} catch {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/** Keep this attempt's approval and the stage last said: whether it was kept. */
|
|
55
|
+
function saveApproval(attempt, account, stage) {
|
|
56
|
+
if (!attempt) return false;
|
|
57
|
+
try {
|
|
58
|
+
fs.mkdirSync(getStateFolder(), { recursive: true, mode: 0o700 });
|
|
59
|
+
const file = path.join(getStateFolder(), APPROVAL_NAME);
|
|
60
|
+
const temp = `${file}.${process.pid}`;
|
|
61
|
+
fs.writeFileSync(temp, JSON.stringify({ v: APPROVAL_VERSION, attempt, account, stage }), { mode: 0o600 });
|
|
62
|
+
fs.renameSync(temp, file);
|
|
63
|
+
return true;
|
|
64
|
+
} catch {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
|
|
39
69
|
class ApprovalWatch {
|
|
40
|
-
/** `pending`: the sign-in `startSignIn` left. `write` takes each progress line (stdout by default).
|
|
70
|
+
/** `pending`: the sign-in `startSignIn` left. `write` takes each progress line (stdout by default). An
|
|
71
|
+
* approval an earlier call of this attempt read is known at once, never read again. */
|
|
41
72
|
constructor(pending, { fetchImpl = fetch, write = writeLine, now = Date.now } = {}) {
|
|
42
73
|
this.pending = pending;
|
|
43
74
|
this.fetchImpl = fetchImpl;
|
|
44
75
|
this.write = write;
|
|
45
76
|
this.now = now;
|
|
46
|
-
|
|
47
|
-
this.
|
|
77
|
+
const kept = loadApproval(pending.attempt);
|
|
78
|
+
this.status = kept ? ApprovalStatus.APPROVED : null;
|
|
79
|
+
this.account = kept && typeof kept.account === "string" ? kept.account : null;
|
|
80
|
+
this.reportedStage = kept ? kept.stage || null : null;
|
|
48
81
|
this.readGapMs = Math.max(MIN_READ_GAP_MS, (Number(pending.interval) || 0) * 1000);
|
|
49
82
|
this.nextReadMs = 0;
|
|
50
|
-
this.
|
|
83
|
+
this.isWatching = false;
|
|
51
84
|
}
|
|
52
85
|
|
|
53
|
-
/**
|
|
86
|
+
/**
|
|
87
|
+
* Read the approval when a read is due. True when it came in this read while Probe still installs
|
|
88
|
+
* (`stage` set, not done): the caller answers at once with `getRunAgainFacts(stage)`, which this
|
|
89
|
+
* reports as said. Otherwise, once approved, one line for `stage` (InstallStage) if it is new.
|
|
90
|
+
*/
|
|
54
91
|
async update(stage = null) {
|
|
92
|
+
this.isWatching = true;
|
|
93
|
+
let isNew = false;
|
|
55
94
|
if (!SETTLED.includes(this.status) && this.now() >= this.nextReadMs) {
|
|
56
95
|
this.nextReadMs = this.now() + this.readGapMs;
|
|
57
96
|
const read = await fetchApproval(this.pending, { fetchImpl: this.fetchImpl });
|
|
58
|
-
if (read)
|
|
97
|
+
if (read) {
|
|
98
|
+
isNew = read.status === ApprovalStatus.APPROVED;
|
|
99
|
+
({ status: this.status, account: this.account } = read);
|
|
100
|
+
}
|
|
59
101
|
}
|
|
60
|
-
|
|
102
|
+
// Ends the call only when the next one will know: unkept, every call would read it anew and end again.
|
|
103
|
+
if (isNew && stage && stage !== InstallStage.DONE && saveApproval(this.pending.attempt, this.account, stage)) {
|
|
61
104
|
this.reportedStage = stage;
|
|
62
|
-
|
|
63
|
-
|
|
105
|
+
return true;
|
|
106
|
+
}
|
|
107
|
+
if (this.isApproved() && stage && stage !== this.reportedStage) {
|
|
108
|
+
this.markSaid(stage);
|
|
109
|
+
this.write(toProgressLine({ say: getApprovedSay(this.account, stage), approved: true, account: this.account,
|
|
110
|
+
stage }));
|
|
64
111
|
}
|
|
112
|
+
if (isNew) saveApproval(this.pending.attempt, this.account, this.reportedStage);
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/** `stage` was said to the person (a line or an answer): kept for this attempt's next call; whether it was. */
|
|
117
|
+
markSaid(stage) {
|
|
118
|
+
this.reportedStage = stage;
|
|
119
|
+
return saveApproval(this.pending.attempt, this.account, stage);
|
|
65
120
|
}
|
|
66
121
|
|
|
67
|
-
/** Whether
|
|
68
|
-
|
|
69
|
-
return this.
|
|
122
|
+
/** Whether this call watched the install (it does only while Probe installs). */
|
|
123
|
+
hasWatched() {
|
|
124
|
+
return this.isWatching;
|
|
70
125
|
}
|
|
71
126
|
|
|
72
127
|
isApproved() {
|
|
@@ -90,4 +145,4 @@ class ApprovalWatch {
|
|
|
90
145
|
}
|
|
91
146
|
}
|
|
92
147
|
|
|
93
|
-
module.exports = { ApprovalWatch, InstallStage,
|
|
148
|
+
module.exports = { APPROVAL_NAME, ApprovalWatch, InstallStage, getApprovedSay };
|
package/lib/setup-check.js
CHANGED
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
|
|
7
7
|
const { spawnSync } = require("node:child_process");
|
|
8
8
|
|
|
9
|
+
const { getSignInBase } = require("./sign-in");
|
|
10
|
+
|
|
9
11
|
/** What install.md's first step ran before: the same status, with the same flags. */
|
|
10
12
|
const STATUS_ARGS = Object.freeze(["status", "--json", "--refresh"]);
|
|
11
13
|
/** Status's answer is ~25 KB on a computer with every agent set up; past spawnSync's 1 MB default it would be cut. */
|
|
@@ -13,6 +15,9 @@ const MAX_ANSWER_BYTES = 16 * 1024 * 1024;
|
|
|
13
15
|
|
|
14
16
|
/** `setup.why`'s word for "no saved sign-in" (the CLI's `SetupGap.SIGNED_OUT`). */
|
|
15
17
|
const SIGNED_OUT_GAP = "signed_out";
|
|
18
|
+
/** `setup.why`'s word for an account check with no answer in time (the CLI's `SetupGap.CREDENTIAL_UNCHECKED`):
|
|
19
|
+
* said alone only when nothing is missing on this computer. */
|
|
20
|
+
const UNCHECKED_GAP = "credential_unchecked";
|
|
16
21
|
|
|
17
22
|
/** What the status said about signing in here. */
|
|
18
23
|
const SetupCheck = Object.freeze({
|
|
@@ -20,17 +25,44 @@ const SetupCheck = Object.freeze({
|
|
|
20
25
|
SET_UP: "set_up",
|
|
21
26
|
/** The status refused (`ok: false` with a `reason`): answer it, so the agent acts on its reason. */
|
|
22
27
|
REFUSED: "refused",
|
|
23
|
-
/** Anything else (none, partial signed out, unknown, an older CLI with no `setup`): sign in. */
|
|
28
|
+
/** Anything else (none, partial signed out, any other unknown, an older CLI with no `setup`): sign in. */
|
|
24
29
|
NOT_SET_UP: "not_set_up",
|
|
25
30
|
/** The status did not answer before `deadlineMs`. */
|
|
26
31
|
TIMED_OUT: "timed_out",
|
|
27
32
|
});
|
|
28
33
|
|
|
29
|
-
/**
|
|
30
|
-
|
|
34
|
+
/**
|
|
35
|
+
* Whether step 1 goes to the re-paste menu (install.md): `done`, `partial` still signed in (PR23b, P3: a plugin
|
|
36
|
+
* off), or `unknown` only because the 2 s account check went unanswered (offline, a slow server): a set-up
|
|
37
|
+
* computer never gets a new sign-in tab for that (D48, fixes-1107 item 2c). A refused key still signs in.
|
|
38
|
+
*/
|
|
39
|
+
function isSetUp(setup, env = {}) {
|
|
31
40
|
if (!setup || typeof setup !== "object") return false;
|
|
41
|
+
const why = Array.isArray(setup.why) ? setup.why : [];
|
|
32
42
|
if (setup.state === "done") return true;
|
|
33
|
-
|
|
43
|
+
if (setup.state === "unknown") return why.length === 1 && why[0] === UNCHECKED_GAP && isSavedAddress(env);
|
|
44
|
+
return setup.state === "partial" && !why.includes(SIGNED_OUT_GAP);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Whether this call aims at the saved sign-in's own server (`PROBE_BASE_URL` unset, or the same address): only
|
|
49
|
+
* there does the CLI ask about the key (D26), so elsewhere `credential_unchecked` means "never asked" and the
|
|
50
|
+
* call signs in to that server.
|
|
51
|
+
*/
|
|
52
|
+
function isSavedAddress(env) {
|
|
53
|
+
if (!env.PROBE_BASE_URL) return true;
|
|
54
|
+
return toAddress(env.PROBE_BASE_URL) === toAddress(getSignInBase({ ...env, PROBE_BASE_URL: "" }));
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** `url` as two addresses compare (the CLI's `normalize_endpoint`): host lower case, default port and trailing
|
|
58
|
+
* slashes dropped. */
|
|
59
|
+
function toAddress(url) {
|
|
60
|
+
try {
|
|
61
|
+
const parsed = new URL(String(url).trim());
|
|
62
|
+
return `${parsed.protocol}//${parsed.host}${parsed.pathname.replace(/\/+$/, "")}`;
|
|
63
|
+
} catch {
|
|
64
|
+
return String(url).trim().replace(/\/+$/, "");
|
|
65
|
+
}
|
|
34
66
|
}
|
|
35
67
|
|
|
36
68
|
/** The last stdout line as an object, or null. */
|
|
@@ -59,11 +91,11 @@ function runSetupCheck({ launcher, deadlineMs, env = process.env }) {
|
|
|
59
91
|
if (ran.error || ran.signal) return { check: SetupCheck.TIMED_OUT, stdout: "", code: 1 };
|
|
60
92
|
const answer = getLastAnswer(ran.stdout);
|
|
61
93
|
const code = ran.status === null ? 1 : ran.status;
|
|
62
|
-
if (answer && isSetUp(answer.setup)) return { check: SetupCheck.SET_UP, stdout: ran.stdout, code };
|
|
94
|
+
if (answer && isSetUp(answer.setup, env)) return { check: SetupCheck.SET_UP, stdout: ran.stdout, code };
|
|
63
95
|
if (answer && answer.ok === false && typeof answer.reason === "string") {
|
|
64
96
|
return { check: SetupCheck.REFUSED, stdout: ran.stdout, code };
|
|
65
97
|
}
|
|
66
98
|
return { check: SetupCheck.NOT_SET_UP, stdout: ran.stdout, code };
|
|
67
99
|
}
|
|
68
100
|
|
|
69
|
-
module.exports = { SIGNED_OUT_GAP, SetupCheck, isSetUp, runSetupCheck };
|
|
101
|
+
module.exports = { SIGNED_OUT_GAP, SetupCheck, UNCHECKED_GAP, isSetUp, runSetupCheck };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "probe-research",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.0",
|
|
4
4
|
"description": "Setup wizard for Probe Research in your coding agents. Runs from zero with npx.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"probe-research": "bin/probe-research.js"
|
|
@@ -26,6 +26,6 @@
|
|
|
26
26
|
"probe-research"
|
|
27
27
|
],
|
|
28
28
|
"scripts": {
|
|
29
|
-
"test": "node --test test/resolve.test.js test/sign-in.test.js"
|
|
29
|
+
"test": "node --test test/resolve.test.js test/sign-in.test.js test/contract.test.js test/setup-check.test.js"
|
|
30
30
|
}
|
|
31
31
|
}
|