@cortexkit/opencode-antigravity-auth 3.0.40 → 3.0.42
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/dist/cli.js +1277 -1073
- package/dist/cli.js.map +4 -4
- package/dist/cli.meta.json +122 -112
- package/dist/index.js +7472 -4214
- package/dist/index.js.map +4 -4
- package/dist/index.meta.json +1494 -509
- package/dist/server.js +5990 -2678
- package/dist/server.js.map +4 -4
- package/dist/server.meta.json +1 -1
- package/dist/src/common-auth-embedded/commands/builtins.d.ts +20 -1
- package/dist/src/common-auth-embedded/commands/builtins.js +28 -12
- package/dist/src/common-auth-embedded/commands/index.d.ts +1 -1
- package/dist/src/common-auth-embedded/commands/menu.d.ts +6 -1
- package/dist/src/common-auth-embedded/commands/menu.js +1 -0
- package/dist/src/common-auth-embedded/fs/file-read-cache.js +9 -5
- package/dist/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
- package/dist/src/common-auth-embedded/fs/refresh-file-lock.js +159 -11
- package/dist/src/common-auth-embedded/fs/with-lock.d.ts +2 -0
- package/dist/src/common-auth-embedded/fs/with-lock.js +1 -1
- package/dist/src/common-auth-embedded/routing-accessor/index.d.ts +33 -5
- package/dist/src/common-auth-embedded/routing-accessor/index.js +49 -7
- package/dist/src/common-auth-embedded/settings/define.d.ts +35 -0
- package/dist/src/common-auth-embedded/settings/define.js +52 -0
- package/dist/src/common-auth-embedded/settings/descriptors.d.ts +97 -0
- package/dist/src/common-auth-embedded/settings/descriptors.js +81 -0
- package/dist/src/common-auth-embedded/settings/edit.d.ts +24 -0
- package/dist/src/common-auth-embedded/settings/edit.js +229 -0
- package/dist/src/common-auth-embedded/settings/fs.js +19 -0
- package/dist/src/common-auth-embedded/settings/handle.d.ts +30 -0
- package/dist/src/common-auth-embedded/settings/handle.js +228 -0
- package/dist/src/common-auth-embedded/settings/index.d.ts +10 -0
- package/dist/src/common-auth-embedded/settings/index.js +7 -0
- package/dist/src/common-auth-embedded/settings/lock-errors.js +15 -0
- package/dist/src/common-auth-embedded/settings/move.d.ts +76 -0
- package/dist/src/common-auth-embedded/settings/move.js +351 -0
- package/dist/src/common-auth-embedded/settings/parse.d.ts +24 -0
- package/dist/src/common-auth-embedded/settings/parse.js +65 -0
- package/dist/src/common-auth-embedded/settings/paths.d.ts +12 -0
- package/dist/src/common-auth-embedded/settings/paths.js +48 -0
- package/dist/src/common-auth-embedded/settings/refusal.d.ts +7 -0
- package/dist/src/common-auth-embedded/settings/refusal.js +15 -0
- package/dist/src/common-auth-embedded/settings/resolve.d.ts +15 -0
- package/dist/src/common-auth-embedded/settings/resolve.js +51 -0
- package/dist/src/common-auth-embedded/settings/schema.d.ts +29 -0
- package/dist/src/common-auth-embedded/settings/schema.js +81 -0
- package/dist/src/common-auth-embedded/settings/snapshot.d.ts +24 -0
- package/dist/src/common-auth-embedded/settings/snapshot.js +150 -0
- package/dist/src/common-auth-embedded/settings/update.js +139 -0
- package/dist/src/common-auth-embedded/settings/write.js +88 -0
- package/dist/src/common-auth-embedded/setup/command-error.d.ts +1 -1
- package/dist/src/common-auth-embedded/setup/command-error.js +3 -2
- package/dist/src/common-auth-embedded/setup/command.js +5 -1
- package/dist/src/common-auth-embedded/setup/enroll.js +3 -3
- package/dist/src/common-auth-embedded/setup/enrollment-access.js +13 -4
- package/dist/src/common-auth-embedded/setup/types.d.ts +4 -0
- package/dist/src/common-auth-embedded/source-output.json +297 -61
- package/dist/src/common-auth-embedded/tui-prefs/watcher.js +196 -0
- package/dist/src/ga/tui/host-ga.js +1 -1
- package/dist/src/ga/tui/host-ga.js.map +1 -1
- package/dist/src/plugin/__fixtures__/verified-store.js +2 -2
- package/dist/src/plugin/command-apply.d.ts +43 -3
- package/dist/src/plugin/command-apply.d.ts.map +1 -1
- package/dist/src/plugin/command-apply.js +92 -12
- package/dist/src/plugin/command-apply.js.map +1 -1
- package/dist/src/plugin/commands.d.ts +5 -1
- package/dist/src/plugin/commands.d.ts.map +1 -1
- package/dist/src/plugin/commands.js +4 -3
- package/dist/src/plugin/commands.js.map +1 -1
- package/dist/src/plugin/config/writer.d.ts +10 -3
- package/dist/src/plugin/config/writer.d.ts.map +1 -1
- package/dist/src/plugin/config/writer.js +30 -22
- package/dist/src/plugin/config/writer.js.map +1 -1
- package/dist/src/plugin/fetch-interceptor.d.ts +8 -3
- package/dist/src/plugin/fetch-interceptor.d.ts.map +1 -1
- package/dist/src/plugin/fetch-interceptor.js +1 -0
- package/dist/src/plugin/fetch-interceptor.js.map +1 -1
- package/dist/src/plugin/ga-location-services.d.ts +3 -1
- package/dist/src/plugin/ga-location-services.d.ts.map +1 -1
- package/dist/src/plugin/ga-location-services.js +35 -5
- package/dist/src/plugin/ga-location-services.js.map +1 -1
- package/dist/src/plugin/index.d.ts.map +1 -1
- package/dist/src/plugin/index.js +65 -15
- package/dist/src/plugin/index.js.map +1 -1
- package/dist/src/plugin/killswitch.d.ts +20 -0
- package/dist/src/plugin/killswitch.d.ts.map +1 -1
- package/dist/src/plugin/killswitch.js +14 -4
- package/dist/src/plugin/killswitch.js.map +1 -1
- package/dist/src/plugin/operator-settings.d.ts +6 -0
- package/dist/src/plugin/operator-settings.d.ts.map +1 -1
- package/dist/src/plugin/operator-settings.js.map +1 -1
- package/dist/src/plugin/request-helpers.d.ts +15 -0
- package/dist/src/plugin/request-helpers.d.ts.map +1 -1
- package/dist/src/plugin/request-helpers.js +17 -2
- package/dist/src/plugin/request-helpers.js.map +1 -1
- package/dist/src/plugin/shared/request-services.d.ts +18 -2
- package/dist/src/plugin/shared/request-services.d.ts.map +1 -1
- package/dist/src/plugin/shared/request-services.js +130 -13
- package/dist/src/plugin/shared/request-services.js.map +1 -1
- package/dist/src/plugin/shared/runtime.d.ts +15 -0
- package/dist/src/plugin/shared/runtime.d.ts.map +1 -1
- package/dist/src/plugin/shared/runtime.js +43 -11
- package/dist/src/plugin/shared/runtime.js.map +1 -1
- package/dist/src/plugin/shared/vault-menu.d.ts +11 -1
- package/dist/src/plugin/shared/vault-menu.d.ts.map +1 -1
- package/dist/src/plugin/shared/vault-menu.js +33 -7
- package/dist/src/plugin/shared/vault-menu.js.map +1 -1
- package/dist/src/settings/core-settings.d.ts +7 -0
- package/dist/src/settings/core-settings.d.ts.map +1 -0
- package/dist/src/settings/core-settings.js +7 -0
- package/dist/src/settings/core-settings.js.map +1 -0
- package/dist/src/settings/legacy.d.ts +89 -0
- package/dist/src/settings/legacy.d.ts.map +1 -0
- package/dist/src/settings/legacy.js +184 -0
- package/dist/src/settings/legacy.js.map +1 -0
- package/dist/src/settings/location.d.ts +22 -0
- package/dist/src/settings/location.d.ts.map +1 -0
- package/dist/src/settings/location.js +49 -0
- package/dist/src/settings/location.js.map +1 -0
- package/dist/src/settings/move.d.ts +38 -0
- package/dist/src/settings/move.d.ts.map +1 -0
- package/dist/src/settings/move.js +83 -0
- package/dist/src/settings/move.js.map +1 -0
- package/dist/src/settings/protection.d.ts +11 -0
- package/dist/src/settings/protection.d.ts.map +1 -0
- package/dist/src/settings/protection.js +17 -0
- package/dist/src/settings/protection.js.map +1 -0
- package/dist/src/settings/report.d.ts +33 -0
- package/dist/src/settings/report.d.ts.map +1 -0
- package/dist/src/settings/report.js +103 -0
- package/dist/src/settings/report.js.map +1 -0
- package/dist/src/settings/runtime.d.ts +145 -0
- package/dist/src/settings/runtime.d.ts.map +1 -0
- package/dist/src/settings/runtime.js +697 -0
- package/dist/src/settings/runtime.js.map +1 -0
- package/dist/tui-build-map.json +1 -1
- package/dist/tui-ga-build-map.json +5 -5
- package/dist/types/src/common-auth-embedded/commands/builtins.d.ts +20 -1
- package/dist/types/src/common-auth-embedded/commands/index.d.ts +1 -1
- package/dist/types/src/common-auth-embedded/commands/menu.d.ts +6 -1
- package/dist/types/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
- package/dist/types/src/common-auth-embedded/routing-accessor/index.d.ts +33 -5
- package/dist/types/src/common-auth-embedded/setup/command-error.d.ts +1 -1
- package/dist/types/src/common-auth-embedded/setup/types.d.ts +4 -0
- package/dist/types/src/plugin/command-apply.d.ts +43 -3
- package/dist/types/src/plugin/command-apply.d.ts.map +1 -1
- package/dist/types/src/plugin/commands.d.ts +5 -1
- package/dist/types/src/plugin/commands.d.ts.map +1 -1
- package/dist/types/src/plugin/config/writer.d.ts +10 -3
- package/dist/types/src/plugin/config/writer.d.ts.map +1 -1
- package/dist/types/src/plugin/fetch-interceptor.d.ts +8 -3
- package/dist/types/src/plugin/fetch-interceptor.d.ts.map +1 -1
- package/dist/types/src/plugin/ga-location-services.d.ts +3 -1
- package/dist/types/src/plugin/ga-location-services.d.ts.map +1 -1
- package/dist/types/src/plugin/index.d.ts.map +1 -1
- package/dist/types/src/plugin/killswitch.d.ts +20 -0
- package/dist/types/src/plugin/killswitch.d.ts.map +1 -1
- package/dist/types/src/plugin/operator-settings.d.ts +6 -0
- package/dist/types/src/plugin/operator-settings.d.ts.map +1 -1
- package/dist/types/src/plugin/request-helpers.d.ts +15 -0
- package/dist/types/src/plugin/request-helpers.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/request-services.d.ts +18 -2
- package/dist/types/src/plugin/shared/request-services.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/runtime.d.ts +15 -0
- package/dist/types/src/plugin/shared/runtime.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/vault-menu.d.ts +11 -1
- package/dist/types/src/plugin/shared/vault-menu.d.ts.map +1 -1
- package/dist/types/src/settings/core-settings.d.ts +7 -0
- package/dist/types/src/settings/core-settings.d.ts.map +1 -0
- package/dist/types/src/settings/legacy.d.ts +89 -0
- package/dist/types/src/settings/legacy.d.ts.map +1 -0
- package/dist/types/src/settings/location.d.ts +22 -0
- package/dist/types/src/settings/location.d.ts.map +1 -0
- package/dist/types/src/settings/move.d.ts +38 -0
- package/dist/types/src/settings/move.d.ts.map +1 -0
- package/dist/types/src/settings/protection.d.ts +11 -0
- package/dist/types/src/settings/protection.d.ts.map +1 -0
- package/dist/types/src/settings/report.d.ts +33 -0
- package/dist/types/src/settings/report.d.ts.map +1 -0
- package/dist/types/src/settings/runtime.d.ts +145 -0
- package/dist/types/src/settings/runtime.d.ts.map +1 -0
- package/package.json +3 -2
- package/src/common-auth-embedded/commands/builtins.d.ts +20 -1
- package/src/common-auth-embedded/commands/builtins.js +28 -12
- package/src/common-auth-embedded/commands/index.d.ts +1 -1
- package/src/common-auth-embedded/commands/menu.d.ts +6 -1
- package/src/common-auth-embedded/commands/menu.js +1 -0
- package/src/common-auth-embedded/fs/file-read-cache.js +9 -5
- package/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
- package/src/common-auth-embedded/fs/refresh-file-lock.js +159 -11
- package/src/common-auth-embedded/fs/with-lock.d.ts +2 -0
- package/src/common-auth-embedded/fs/with-lock.js +1 -1
- package/src/common-auth-embedded/routing-accessor/index.d.ts +33 -5
- package/src/common-auth-embedded/routing-accessor/index.js +49 -7
- package/src/common-auth-embedded/settings/define.d.ts +35 -0
- package/src/common-auth-embedded/settings/define.js +52 -0
- package/src/common-auth-embedded/settings/descriptors.d.ts +97 -0
- package/src/common-auth-embedded/settings/descriptors.js +81 -0
- package/src/common-auth-embedded/settings/edit.d.ts +24 -0
- package/src/common-auth-embedded/settings/edit.js +229 -0
- package/src/common-auth-embedded/settings/fs.js +19 -0
- package/src/common-auth-embedded/settings/handle.d.ts +30 -0
- package/src/common-auth-embedded/settings/handle.js +228 -0
- package/src/common-auth-embedded/settings/index.d.ts +10 -0
- package/src/common-auth-embedded/settings/index.js +7 -0
- package/src/common-auth-embedded/settings/lock-errors.js +15 -0
- package/src/common-auth-embedded/settings/move.d.ts +76 -0
- package/src/common-auth-embedded/settings/move.js +351 -0
- package/src/common-auth-embedded/settings/parse.d.ts +24 -0
- package/src/common-auth-embedded/settings/parse.js +65 -0
- package/src/common-auth-embedded/settings/paths.d.ts +12 -0
- package/src/common-auth-embedded/settings/paths.js +48 -0
- package/src/common-auth-embedded/settings/refusal.d.ts +7 -0
- package/src/common-auth-embedded/settings/refusal.js +15 -0
- package/src/common-auth-embedded/settings/resolve.d.ts +15 -0
- package/src/common-auth-embedded/settings/resolve.js +51 -0
- package/src/common-auth-embedded/settings/schema.d.ts +29 -0
- package/src/common-auth-embedded/settings/schema.js +81 -0
- package/src/common-auth-embedded/settings/snapshot.d.ts +24 -0
- package/src/common-auth-embedded/settings/snapshot.js +150 -0
- package/src/common-auth-embedded/settings/update.js +139 -0
- package/src/common-auth-embedded/settings/write.js +88 -0
- package/src/common-auth-embedded/setup/command-error.d.ts +1 -1
- package/src/common-auth-embedded/setup/command-error.js +3 -2
- package/src/common-auth-embedded/setup/command.js +5 -1
- package/src/common-auth-embedded/setup/enroll.js +3 -3
- package/src/common-auth-embedded/setup/enrollment-access.js +13 -4
- package/src/common-auth-embedded/setup/types.d.ts +4 -0
- package/src/common-auth-embedded/source-output.json +297 -61
- package/src/common-auth-embedded/tui-prefs/watcher.js +196 -0
- package/src/tui-ga-compiled/host-ga.js +1 -1
- package/src/tui-ga-raw/host-ga.tsx +1 -1
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { SettingsFs } from './fs.js';
|
|
3
|
+
import { SettingsRefusal } from './refusal.js';
|
|
4
|
+
let stepHook;
|
|
5
|
+
const HARD_LINK_UNSUPPORTED = new Set([
|
|
6
|
+
'EPERM',
|
|
7
|
+
'ENOTSUP',
|
|
8
|
+
'EOPNOTSUPP',
|
|
9
|
+
'ENOSYS',
|
|
10
|
+
]);
|
|
11
|
+
/** Internal test hook, deliberately absent from the package entry point. */
|
|
12
|
+
export function setSettingsWriteStepHookForTest(hook) {
|
|
13
|
+
stepHook = hook;
|
|
14
|
+
}
|
|
15
|
+
/** Publish already validated edits while the caller holds the target's lock. */
|
|
16
|
+
export async function writeSettings(options) {
|
|
17
|
+
const { target, text, hasBom, existingMode, lock, logger } = options;
|
|
18
|
+
const platform = options.platform ?? process.platform;
|
|
19
|
+
const temp = `${target}.${randomUUID()}.tmp`;
|
|
20
|
+
let staged = false;
|
|
21
|
+
let published = false;
|
|
22
|
+
try {
|
|
23
|
+
const file = await SettingsFs.open(temp, 'wx', 0o644);
|
|
24
|
+
staged = true;
|
|
25
|
+
try {
|
|
26
|
+
await file.writeFile(`${hasBom ? '\uFEFF' : ''}${text}`, 'utf8');
|
|
27
|
+
if (platform !== 'win32' && existingMode !== undefined) {
|
|
28
|
+
await file.chmod(existingMode & 0o777);
|
|
29
|
+
}
|
|
30
|
+
await file.sync();
|
|
31
|
+
}
|
|
32
|
+
finally {
|
|
33
|
+
await file.close();
|
|
34
|
+
}
|
|
35
|
+
await stepHook?.('staged', { target, temp });
|
|
36
|
+
await lock.assertOwned();
|
|
37
|
+
if (existingMode !== undefined) {
|
|
38
|
+
try {
|
|
39
|
+
await SettingsFs.rename(temp, target);
|
|
40
|
+
}
|
|
41
|
+
catch (error) {
|
|
42
|
+
if (platform === 'win32' &&
|
|
43
|
+
['EPERM', 'EACCES', 'EBUSY'].includes(error.code ?? '')) {
|
|
44
|
+
throw new SettingsRefusal('settings-busy', `Settings file is busy: ${target}`, { cause: error });
|
|
45
|
+
}
|
|
46
|
+
throw error;
|
|
47
|
+
}
|
|
48
|
+
published = true;
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
try {
|
|
52
|
+
// A hard link never replaces a file created since the locked read.
|
|
53
|
+
await SettingsFs.link(temp, target);
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
const code = error.code ?? '';
|
|
57
|
+
if (code === 'EEXIST') {
|
|
58
|
+
throw new SettingsRefusal('settings-busy', `Settings file appeared before publication: ${target}`, { cause: error });
|
|
59
|
+
}
|
|
60
|
+
// Some filesystems (FAT, exFAT, some network and user-space mounts) have no
|
|
61
|
+
// hard links. A non-atomic create could expose a half-written file, so
|
|
62
|
+
// refuse instead of falling back.
|
|
63
|
+
if (HARD_LINK_UNSUPPORTED.has(code)) {
|
|
64
|
+
throw new SettingsRefusal('settings-unavailable', `Settings file cannot be created on this filesystem: ${target}`, { cause: error });
|
|
65
|
+
}
|
|
66
|
+
throw error;
|
|
67
|
+
}
|
|
68
|
+
published = true;
|
|
69
|
+
try {
|
|
70
|
+
await SettingsFs.unlink(temp);
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
// Publication succeeded; an orphaned temp must not turn it into a refusal.
|
|
74
|
+
logger?.warn('Settings temp cleanup failed after publication', {
|
|
75
|
+
target,
|
|
76
|
+
temp,
|
|
77
|
+
error,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
return { outcome: 'updated' };
|
|
82
|
+
}
|
|
83
|
+
finally {
|
|
84
|
+
if (staged && !published) {
|
|
85
|
+
await SettingsFs.unlink(temp).catch(() => { });
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
@@ -17,7 +17,7 @@ export declare class SetupCommandError extends Error {
|
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
/** The line setup prints for one host's outcome, e.g. `Pi: not connected`. */
|
|
20
|
-
export declare function setupEnrollmentLine({ host, outcome, access
|
|
20
|
+
export declare function setupEnrollmentLine({ host, outcome, access }: SetupHostEnrollment, grantFallback?: 'setup' | 'plugin'): string;
|
|
21
21
|
/**
|
|
22
22
|
* Remember which hosts a failed setup left connected to the vault, against the
|
|
23
23
|
* thrown value. Only objects can carry a record; a thrown primitive is left as
|
|
@@ -48,8 +48,9 @@ const OUTCOME_TEXT = {
|
|
|
48
48
|
unknown: 'unknown, check with ck auth status',
|
|
49
49
|
};
|
|
50
50
|
/** The line setup prints for one host's outcome, e.g. `Pi: not connected`. */
|
|
51
|
-
export function setupEnrollmentLine({ host, outcome, access,
|
|
52
|
-
|
|
51
|
+
export function setupEnrollmentLine({ host, outcome, access }, grantFallback = 'setup') {
|
|
52
|
+
const lines = access ? enrollmentAccessLines(access, grantFallback) : [];
|
|
53
|
+
return `${HOST_LABELS[host]}: ${OUTCOME_TEXT[outcome]}${lines.length ? ` — ${lines.join('\n')}` : ''}`;
|
|
53
54
|
}
|
|
54
55
|
// Outcomes recorded against the value a failed `runSetup` threw. A WeakMap
|
|
55
56
|
// keeps the thrown value itself untouched: setup never reads, rewrites or
|
|
@@ -26,6 +26,10 @@ function validatePlugin(plugin) {
|
|
|
26
26
|
if (host.requestedGrants !== undefined &&
|
|
27
27
|
!validEnrollmentRequestedGrants(host.requestedGrants))
|
|
28
28
|
throw new Error('invalid Claustrum enrollment requested grants');
|
|
29
|
+
if (host.grantFallback !== undefined &&
|
|
30
|
+
host.grantFallback !== 'setup' &&
|
|
31
|
+
host.grantFallback !== 'plugin')
|
|
32
|
+
throw new Error('invalid Claustrum enrollment grant fallback');
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
35
|
/**
|
|
@@ -264,7 +268,7 @@ export async function runSetup(plugin, argv = [], io = {}) {
|
|
|
264
268
|
const report = await enrollmentReport(plugin, hosts, enrollment, enrollmentAccess);
|
|
265
269
|
recordSetupEnrollment(error, report);
|
|
266
270
|
for (const entry of report)
|
|
267
|
-
printLine(terminal, setupEnrollmentLine(entry));
|
|
271
|
+
printLine(terminal, setupEnrollmentLine(entry, plugin.vault.hosts[entry.host].grantFallback));
|
|
268
272
|
}
|
|
269
273
|
catch { }
|
|
270
274
|
throw error;
|
|
@@ -55,7 +55,7 @@ function approveCommand(requestId, name) {
|
|
|
55
55
|
export async function connectSetupHost(plugin, host, io, terminal, fence) {
|
|
56
56
|
if (hasVaultHost())
|
|
57
57
|
throw new Error(VAULT_HOST_CONNECT_REFUSAL);
|
|
58
|
-
const { name, displayName, requestedGrants, paths: input, } = plugin.vault.hosts[host];
|
|
58
|
+
const { name, displayName, requestedGrants, grantFallback, paths: input, } = plugin.vault.hosts[host];
|
|
59
59
|
const paths = hostEnrollmentPaths(input);
|
|
60
60
|
await fence();
|
|
61
61
|
const client = await (io.connect ?? connectClaustrumEnrollmentClient)({
|
|
@@ -89,7 +89,7 @@ export async function connectSetupHost(plugin, host, io, terminal, fence) {
|
|
|
89
89
|
printLine(terminal, `Already connected as ${initial.approvedName ?? initial.proposedName}.`);
|
|
90
90
|
const access = await confirmEnrollmentAccess(client, initial, paths.tokenPath, requestedGrants);
|
|
91
91
|
if (access)
|
|
92
|
-
for (const line of enrollmentAccessLines(access))
|
|
92
|
+
for (const line of enrollmentAccessLines(access, grantFallback))
|
|
93
93
|
printLine(terminal, line);
|
|
94
94
|
return access;
|
|
95
95
|
}
|
|
@@ -105,7 +105,7 @@ export async function connectSetupHost(plugin, host, io, terminal, fence) {
|
|
|
105
105
|
printLine(terminal, `Connected ${host} to Claustrum.`);
|
|
106
106
|
const access = await confirmEnrollmentAccess(client, status, paths.tokenPath, requestedGrants);
|
|
107
107
|
if (access)
|
|
108
|
-
for (const line of enrollmentAccessLines(access))
|
|
108
|
+
for (const line of enrollmentAccessLines(access, grantFallback))
|
|
109
109
|
printLine(terminal, line);
|
|
110
110
|
return access;
|
|
111
111
|
}
|
|
@@ -17,11 +17,17 @@ export async function confirmEnrollmentAccess(client, status, tokenPath, configu
|
|
|
17
17
|
grantCommand: `ck auth grant --principal ${shellArgument(`enrolled:${status.approvedName}`)} --selector-kind ${grant.selector.exact === undefined ? 'category' : 'exact'} --selector ${shellArgument(grant.selector.exact ?? grant.selector.category)} --operation ${grant.operation}`,
|
|
18
18
|
}),
|
|
19
19
|
}));
|
|
20
|
+
const access = {
|
|
21
|
+
grants,
|
|
22
|
+
...(status.requestedGrantsStatus !== undefined && {
|
|
23
|
+
requestedGrantsStatus: status.requestedGrantsStatus,
|
|
24
|
+
}),
|
|
25
|
+
};
|
|
20
26
|
if (status.requestedGrantsStatus === 'dropped')
|
|
21
|
-
return { state: 'older-vault'
|
|
27
|
+
return { ...access, state: 'older-vault' };
|
|
22
28
|
try {
|
|
23
29
|
if (!client.listScoped)
|
|
24
|
-
return { state: 'unconfirmed'
|
|
30
|
+
return { ...access, state: 'unconfirmed' };
|
|
25
31
|
const { token } = await readClaustrumEnrollmentToken(tokenPath);
|
|
26
32
|
const inventory = await client.listScoped(token);
|
|
27
33
|
const confirmed = grants.map((entry) => ({
|
|
@@ -32,6 +38,7 @@ export async function confirmEnrollmentAccess(client, status, tokenPath, configu
|
|
|
32
38
|
: row.categories.includes(entry.grant.selector.category))).length,
|
|
33
39
|
}));
|
|
34
40
|
return {
|
|
41
|
+
...access,
|
|
35
42
|
state: confirmed.every((entry) => entry.reachableLogins > 0)
|
|
36
43
|
? 'reachable'
|
|
37
44
|
: confirmed.some((entry) => entry.reachableLogins > 0)
|
|
@@ -47,10 +54,12 @@ export async function confirmEnrollmentAccess(client, status, tokenPath, configu
|
|
|
47
54
|
}
|
|
48
55
|
catch {
|
|
49
56
|
// A listing failure cannot undo approval, and its error may contain secrets.
|
|
50
|
-
return { state: 'unconfirmed'
|
|
57
|
+
return { ...access, state: 'unconfirmed' };
|
|
51
58
|
}
|
|
52
59
|
}
|
|
53
|
-
export function enrollmentAccessLines(access) {
|
|
60
|
+
export function enrollmentAccessLines(access, grantFallback = 'setup') {
|
|
61
|
+
if (grantFallback === 'plugin' && access.requestedGrantsStatus !== 'sent')
|
|
62
|
+
return [];
|
|
54
63
|
const lines = [];
|
|
55
64
|
const remedy = access.grants.some((entry) => entry.grantCommand)
|
|
56
65
|
? 'run:'
|
|
@@ -13,6 +13,8 @@ export type SetupEnvironment = Record<string, string | undefined>;
|
|
|
13
13
|
export type SetupEnrollmentOutcome = 'enrolled' | 'not-enrolled' | 'unknown';
|
|
14
14
|
export interface SetupEnrollmentAccess {
|
|
15
15
|
state: 'reachable' | 'no-logins' | 'partial' | 'older-vault' | 'unconfirmed';
|
|
16
|
+
/** Whether grants were sent with the proposal or dropped for an older vault. Absent for enrollments made before 0.44.0. */
|
|
17
|
+
requestedGrantsStatus?: 'sent' | 'dropped';
|
|
16
18
|
/** One result per requested grant, in proposal order. No count means unknown. */
|
|
17
19
|
grants: readonly {
|
|
18
20
|
grant: ClaustrumRequestedGrant;
|
|
@@ -62,6 +64,8 @@ export interface SetupPlugin {
|
|
|
62
64
|
name: string;
|
|
63
65
|
displayName?: string;
|
|
64
66
|
requestedGrants?: ReadonlyArray<ClaustrumRequestedGrant>;
|
|
67
|
+
/** Who reports access when grants were not sent with enrollment; defaults to 'setup'. */
|
|
68
|
+
grantFallback?: 'setup' | 'plugin';
|
|
65
69
|
paths: Parameters<typeof hostEnrollmentPaths>[0];
|
|
66
70
|
}>;
|
|
67
71
|
};
|