@empire-builder-kit/nx 1.0.0-rc.40 → 1.0.0-rc.42

package/src/local-dev/fleet-inventory.js

@@ -22,6 +22,14 @@ function inventoryError(message) {
 function defaultPing(appData, security, fleetId) {
     return new fleet_client_js_1.FleetClient((0, runtime_paths_js_1.fleetRuntimePaths)(fleetId, appData), security).ping();
 }
+/**
+ * An ambiguous entry is never pruned, but any actor may inspect it read-only.
+ * The message names where it lives and the owner's recovery; it never prints
+ * an absolute path, which would carry the local account name.
+ */
+function inspectReadOnly(subject, location) {
+    return `${subject}; ebk will not prune it. Inspect ${location} in the per-user EBK application-data directory read-only (any actor may). If it is yours and no ebk dev process for it is running, remove that one entry or restore current-user-only ownership, then rerun ebk dev ps; if another user owns it, leave it for them.`;
+}
 function record(fleetId, classification, nextAction, state) {
     return {
         ...(state
@@ -51,7 +59,7 @@ async function inspectFleet(fleetId, options, effects, recoverRunnerCleanup = fa
     }
     catch {
         return {
-            inventory: record(fleetId, 'ambiguous', 'Inspect the malformed private state manually; do not prune.'),
+            inventory: record(fleetId, 'ambiguous', inspectReadOnly('Private Fleet state is malformed', `sessions/${fleetId}`)),
         };
     }
     if (!state || state.fleetId !== fleetId) {
@@ -197,7 +205,7 @@ async function inventoryFleets(options, effects = {}) {
             results.push({
                 classification: 'ambiguous',
                 fleetId: entry.name.slice(0, 128),
-                nextAction: 'Unsupported session entry; inspect manually and do not prune.',
+                nextAction: inspectReadOnly('Unsupported session entry', 'sessions/'),
                 selectedSlices: [],
             });
             continue;
@@ -259,7 +267,7 @@ async function inventorySliceClaims(options, effects = {}) {
     }
     catch {
         return [
-            ambiguousClaimEntry('slice-claims', 'Slice-claim directory is not current-user private; inspect manually and do not prune.'),
+            ambiguousClaimEntry('slice-claims', inspectReadOnly('Slice-claim directory is not current-user private', 'slice-claims/')),
         ];
     }
     let entries;
@@ -268,7 +276,7 @@ async function inventorySliceClaims(options, effects = {}) {
     }
     catch {
         return [
-            ambiguousClaimEntry('slice-claims', 'Slice-claim directory cannot be read safely; inspect manually and do not prune.'),
+            ambiguousClaimEntry('slice-claims', inspectReadOnly('Slice-claim directory cannot be read safely', 'slice-claims/')),
         ];
     }
     const inspectedFleets = new Map();
@@ -286,7 +294,7 @@ async function inventorySliceClaims(options, effects = {}) {
         if (!/^[a-z0-9][a-z0-9-]{0,62}$/.test(namespace.name) ||
             !namespace.isDirectory() ||
             namespace.isSymbolicLink()) {
-            results.push(ambiguousClaimEntry(namespace.name, 'Unsupported Slice-claim namespace; inspect manually and do not prune.', /^[a-z0-9][a-z0-9-]{0,62}$/.test(namespace.name)
+            results.push(ambiguousClaimEntry(namespace.name, inspectReadOnly('Unsupported Slice-claim namespace', 'slice-claims/'), /^[a-z0-9][a-z0-9-]{0,62}$/.test(namespace.name)
                 ? namespace.name
                 : undefined));
             continue;
@@ -304,13 +312,13 @@ async function inventorySliceClaims(options, effects = {}) {
                 });
         }
         catch {
-            results.push(ambiguousClaimEntry(namespace.name, 'Slice-claim namespace cannot be read safely; inspect manually and do not prune.', namespace.name));
+            results.push(ambiguousClaimEntry(namespace.name, inspectReadOnly('Slice-claim namespace cannot be read safely', 'slice-claims/'), namespace.name));
         }
     }
     for (const { entry, directory: claimDirectory, fleetId } of claims) {
         const match = SLICE_CLAIM_FILE_PATTERN.exec(entry.name);
         if (!match || !entry.isFile() || entry.isSymbolicLink()) {
-            results.push(ambiguousClaimEntry(entry.name, 'Unsupported Slice-claim entry; inspect manually and do not prune.', fleetId));
+            results.push(ambiguousClaimEntry(entry.name, inspectReadOnly('Unsupported Slice-claim entry', 'slice-claims/'), fleetId));
             continue;
         }
         const slice = match[1];
@@ -318,17 +326,17 @@ async function inventorySliceClaims(options, effects = {}) {
         try {
             const inspected = (0, slice_claim_js_1.inspectSliceClaim)(claimDirectory, slice, security);
             if (!inspected) {
-                results.push(ambiguousClaimEntry(slice, 'Slice claim changed during inventory; inspect manually and do not prune.', fleetId));
+                results.push(ambiguousClaimEntry(slice, 'Slice claim changed during inventory; ebk will not prune it. Rerun ebk dev ps; if the change persists, inspect slice-claims/ in the per-user EBK application-data directory read-only.', fleetId));
                 continue;
             }
             if (inspected.slice !== slice || inspected.fleetId !== fleetId) {
-                results.push(ambiguousClaimEntry(slice, 'Slice-claim namespace, filename and record identity disagree; inspect manually and do not prune.', fleetId));
+                results.push(ambiguousClaimEntry(slice, inspectReadOnly('Slice-claim namespace, filename and record identity disagree', 'slice-claims/'), fleetId));
                 continue;
             }
             claim = inspected;
         }
         catch {
-            results.push(ambiguousClaimEntry(slice, 'Slice claim is malformed or not current-user private; inspect manually and do not prune.', fleetId));
+            results.push(ambiguousClaimEntry(slice, inspectReadOnly('Slice claim is malformed or not current-user private', 'slice-claims/'), fleetId));
             continue;
         }
         const ownerPaths = (0, runtime_paths_js_1.fleetRuntimePaths)(claim.fleetId, options.appData);

package/src/local-dev/fleet-launcher.js

@@ -230,7 +230,7 @@ function recoverStartupOnlyRequest(prepared, processProbe, security) {
         startup = (0, fleet_startup_js_1.readFleetStartupRequest)(prepared.paths.startup, security);
     }
     catch {
-        return launchError('stale-state-ambiguous', 'Residual Fleet startup authority is malformed; inspect it manually and do not replace it.');
+        return launchError('stale-state-ambiguous', `Residual Fleet startup authority is malformed; ebk will not replace it. Inspect sessions/${prepared.request.fleetId} in the per-user EBK application-data directory read-only (any actor may). If it is yours and no ebk dev process for it is running, remove that startup file, then rerun the command.`);
     }
     if (startup.fleetId !== prepared.request.fleetId ||
         startup.appData !== prepared.request.appData ||
@@ -270,7 +270,7 @@ function recoverStartupOnlyRequest(prepared, processProbe, security) {
         sessionGeneration: startup.sessionGeneration,
     }).slice(0, 16)}.recover`;
     if ((0, node_fs_1.existsSync)(recoveryPath)) {
-        return launchError('stale-state-ambiguous', 'Residual Fleet startup has a prior recovery artifact; inspect it manually.');
+        return launchError('stale-state-ambiguous', `Residual Fleet startup has a prior recovery artifact; ebk will not replace it. Inspect the .recover file in sessions/${prepared.request.fleetId} of the per-user EBK application-data directory read-only (any actor may). If it is yours and no ebk dev process for it is running, remove that artifact, then rerun the command.`);
     }
     try {
         (0, node_fs_1.renameSync)(prepared.paths.startup, recoveryPath);

package/src/secrets/personal-command.d.ts

@@ -4,9 +4,17 @@ export interface HumanSecretCeremony {
     readonly [HUMAN_SECRET_CEREMONY]: true;
     actor: 'human';
     agentDelegated: boolean;
+    /** Name (never value) of the first agent or CI marker variable detected. */
+    detectedMarker?: string;
     interactive: boolean;
     stdinIsTty: boolean;
 }
+export type PersonalSecretOperation = 'remove' | 'set';
+interface HumanRequiredDetail {
+    detectedMarker?: string;
+    operation: PersonalSecretOperation;
+    reason: 'agent-or-ci' | 'capability' | 'terminal';
+}
 export interface HiddenSecretInputReader {
     readHidden(input: {
         logicalName: string;
@@ -49,7 +57,7 @@ export interface PersonalSecretCommandResult {
 }
 export declare class PersonalSecretCommandError extends Error {
     readonly code: 'personal-secret-account-invalid' | 'personal-secret-command-invalid' | 'personal-secret-confirmation-required' | 'personal-secret-hidden-input-failed' | 'personal-secret-human-required' | 'personal-secret-stage-invalid' | 'personal-secret-store-failed' | 'personal-secret-value-invalid';
-    constructor(code: PersonalSecretCommandError['code']);
+    constructor(code: PersonalSecretCommandError['code'], detail?: HumanRequiredDetail);
 }
 interface PersonalSecretEnvironment {
     accountId: string;
@@ -74,10 +82,18 @@ export interface RemovePersonalSecretInput extends PersonalSecretEnvironment {
  */
 export declare function issueHumanSecretCeremony(input: {
     agentDelegated: boolean;
+    detectedMarker?: string;
     interactive: boolean;
     stdinIsTty: boolean;
 }): HumanSecretCeremony;
-export declare function assertHumanSecretCeremony(ceremony: HumanSecretCeremony): void;
+/**
+ * `set` carries a human-supplied value, so it refuses every agent or CI
+ * marker: a real TTY proves nothing when an agent owns the terminal. `remove`
+ * carries no value and only targets the human's personal development stage,
+ * so an agent-delegated session may start it; it still needs a local
+ * interactive terminal where the human types the hidden confirmation.
+ */
+export declare function assertHumanSecretCeremony(ceremony: HumanSecretCeremony, operation: PersonalSecretOperation): void;
 export declare function setPersonalSstSecret(input: SetPersonalSecretInput): Promise<PersonalSecretCommandResult>;
 export declare function removePersonalSstSecret(input: RemovePersonalSecretInput): Promise<PersonalSecretCommandResult>;
 export {};

package/src/secrets/personal-command.js

@@ -8,10 +8,33 @@ exports.removePersonalSstSecret = removePersonalSstSecret;
 const stages_js_1 = require("../foundation/stages.js");
 const model_js_1 = require("./model.js");
 const HUMAN_SECRET_CEREMONY = Symbol('ebk.human-secret-ceremony');
+const markerNamePattern = /^[A-Z][A-Z0-9_]{0,63}$/;
+function humanRequiredMessage(detail) {
+    const code = '(personal-secret-human-required)';
+    if (detail.reason === 'agent-or-ci') {
+        return [
+            `ebk secret set must be run by a human in a terminal that no agent or CI job spawned ${code},`,
+            'because the hidden prompt does not hide the value from the process that owns this terminal.',
+            'Ask the human to open their own terminal and run the same command;',
+            'agents may use the value-blind secret-metadata and status targets instead.',
+            ...(detail.detectedMarker
+                ? [`Detected agent/CI marker: ${detail.detectedMarker}.`]
+                : []),
+        ].join(' ');
+    }
+    if (detail.reason === 'terminal') {
+        return detail.operation === 'set'
+            ? `ebk secret set needs a local interactive terminal for its hidden value prompt ${code}. Run it in a human-operated terminal that no agent or CI job spawned.`
+            : `ebk secret remove needs a local interactive terminal where the human types the hidden REMOVE <logical-name> confirmation ${code}. An agent may start it only in a terminal the human can type into.`;
+    }
+    return `Personal secret command failed ${code}.`;
+}
 class PersonalSecretCommandError extends Error {
     code;
-    constructor(code) {
-        super(`Personal secret command failed (${code}).`);
+    constructor(code, detail) {
+        super(code === 'personal-secret-human-required' && detail
+            ? humanRequiredMessage(detail)
+            : `Personal secret command failed (${code}).`);
         this.name = 'PersonalSecretCommandError';
         this.code = code;
     }
@@ -24,7 +47,7 @@ function rejectUnexpectedProperties(input, allowed) {
         throw new PersonalSecretCommandError('personal-secret-command-invalid');
     }
 }
-function validateEnvironment(input) {
+function validateEnvironment(input, operation) {
     try {
         (0, model_js_1.validateSecretMetadataDeclaration)(input.declaration);
     }
@@ -42,7 +65,7 @@ function validateEnvironment(input) {
         input.accountId !== input.developmentAccountId) {
         throw new PersonalSecretCommandError('personal-secret-account-invalid');
     }
-    assertHumanSecretCeremony(input.ceremony);
+    assertHumanSecretCeremony(input.ceremony, operation);
 }
 /**
  * Issues the in-process capability used by the CLI after it has inspected the
@@ -52,12 +75,19 @@ function validateEnvironment(input) {
 function issueHumanSecretCeremony(input) {
     if (typeof input.agentDelegated !== 'boolean' ||
         typeof input.interactive !== 'boolean' ||
-        typeof input.stdinIsTty !== 'boolean') {
+        typeof input.stdinIsTty !== 'boolean' ||
+        (input.detectedMarker !== undefined &&
+            (!input.agentDelegated ||
+                typeof input.detectedMarker !== 'string' ||
+                !markerNamePattern.test(input.detectedMarker)))) {
         throw new PersonalSecretCommandError('personal-secret-human-required');
     }
     const ceremony = {
         actor: 'human',
         agentDelegated: input.agentDelegated,
+        ...(input.detectedMarker === undefined
+            ? {}
+            : { detectedMarker: input.detectedMarker }),
         interactive: input.interactive,
         stdinIsTty: input.stdinIsTty,
     };
@@ -69,15 +99,39 @@ function issueHumanSecretCeremony(input) {
     });
     return Object.freeze(ceremony);
 }
-function assertHumanSecretCeremony(ceremony) {
+/**
+ * `set` carries a human-supplied value, so it refuses every agent or CI
+ * marker: a real TTY proves nothing when an agent owns the terminal. `remove`
+ * carries no value and only targets the human's personal development stage,
+ * so an agent-delegated session may start it; it still needs a local
+ * interactive terminal where the human types the hidden confirmation.
+ */
+function assertHumanSecretCeremony(ceremony, operation) {
     if (typeof ceremony !== 'object' ||
         ceremony === null ||
         ceremony[HUMAN_SECRET_CEREMONY] !== true ||
         ceremony.actor !== 'human' ||
-        ceremony.agentDelegated ||
-        !ceremony.interactive ||
-        !ceremony.stdinIsTty) {
-        throw new PersonalSecretCommandError('personal-secret-human-required');
+        (operation !== 'set' && operation !== 'remove')) {
+        throw new PersonalSecretCommandError('personal-secret-human-required', {
+            operation: operation === 'remove' ? 'remove' : 'set',
+            reason: 'capability',
+        });
+    }
+    if (operation === 'set' && ceremony.agentDelegated !== false) {
+        throw new PersonalSecretCommandError('personal-secret-human-required', {
+            ...(typeof ceremony.detectedMarker === 'string' &&
+                markerNamePattern.test(ceremony.detectedMarker)
+                ? { detectedMarker: ceremony.detectedMarker }
+                : {}),
+            operation,
+            reason: 'agent-or-ci',
+        });
+    }
+    if (ceremony.interactive !== true || ceremony.stdinIsTty !== true) {
+        throw new PersonalSecretCommandError('personal-secret-human-required', {
+            operation,
+            reason: 'terminal',
+        });
     }
 }
 async function setPersonalSstSecret(input) {
@@ -92,7 +146,7 @@ async function setPersonalSstSecret(input) {
         'store',
         'validator',
     ]);
-    validateEnvironment(input);
+    validateEnvironment(input, 'set');
     let bytes;
     try {
         bytes = await input.hiddenInput.readHidden({
@@ -163,7 +217,7 @@ async function removePersonalSstSecret(input) {
         'stage',
         'store',
     ]);
-    validateEnvironment(input);
+    validateEnvironment(input, 'remove');
     let confirmed;
     try {
         confirmed = await input.confirmation.confirm({

package/src/secrets/verification.js

@@ -87,7 +87,12 @@ async function collectSourceFiles(projectRoot, directory, declaredSecretNames) {
             ...(path === 'scripts/remove-personal-secrets.mjs'
                 ? { allowFrameworkPersonalSstRemove: true }
                 : {}),
-            ...(['jobs/bootstrap-database.mjs', 'jobs/retire-database.mjs'].includes(path)
+            ...([
+                'authorization/machine-client-provisioner.spec.ts',
+                'authorization/machine-client-provisioner.ts',
+                'jobs/bootstrap-database.mjs',
+                'jobs/retire-database.mjs',
+            ].includes(path)
                 ? { allowFrameworkSecretProviderClient: true }
                 : {}),
             ...(path === 'infra/personal-secrets.ts'