@haibun/core 3.6.0 → 3.8.0

package/build/steps/haibun.d.ts

@@ -19,14 +19,14 @@ declare class Haibun extends AStepper implements IHasCycles {
             gwta: string;
             action: ({ statements }: {
                 statements: TFeatureStep[];
-            }, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult>;
+            }, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult>;
         };
         backgrounds: {
             gwta: string;
             resolveFeatureLine: (line: string, _path: string, _stepper: AStepper, backgrounds: TFeatures) => false;
             action: ({ names }: {
                 names: string;
-            }, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult>;
+            }, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult>;
         };
         nothing: {
             exact: string;
@@ -61,7 +61,7 @@ declare class Haibun extends AStepper implements IHasCycles {
             gwta: string;
             action: ({ result }: {
                 result: string;
-            }) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         showSteppers: {
             exact: string;
@@ -109,7 +109,7 @@ declare class Haibun extends AStepper implements IHasCycles {
             action: ({ statement }: {
                 stepperName: string;
                 statement: TFeatureStep[];
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
     };
 }

package/build/steps/narrator.d.ts

@@ -40,20 +40,20 @@ declare class Narrator extends AStepper implements IHasOptions, IHasCycles {
         prose: {
             precludes: string[];
             match: RegExp;
-            action: (_args: TStepArgs, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult>;
+            action: (_args: TStepArgs, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult>;
         };
         feature: {
             precludes: string[];
             gwta: string;
-            action: ({ feature }: TStepArgs, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult>;
+            action: ({ feature }: TStepArgs, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult>;
         };
         scenario: {
             precludes: string[];
             gwta: string;
-            action: ({ scenario }: TStepArgs, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult>;
+            action: ({ scenario }: TStepArgs, featureStep: TFeatureStep) => Promise<import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult>;
         };
     };
-    maybeSay(featureStep: TFeatureStep): Promise<import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult>;
+    maybeSay(featureStep: TFeatureStep): Promise<import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult>;
 }
 export default Narrator;
 //# sourceMappingURL=narrator.d.ts.map

package/build/steps/variables-stepper.d.ts

@@ -13,7 +13,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ domain, superdomains }: {
                 domain: string;
                 superdomains: TFeatureStep[];
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         defineOrderedSet: {
             precludes: string[];
@@ -22,7 +22,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ domain, values }: {
                 domain: string;
                 values: TFeatureStep[];
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         defineValuesSet: {
             gwta: string;
@@ -30,7 +30,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ domain, values }: {
                 domain: string;
                 values: TFeatureStep[];
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         statementSetValues: {
             expose: false;
@@ -53,7 +53,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
         increment: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         showEnv: {
             gwta: string;
@@ -94,7 +94,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
         is: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         isLessThan: {
             gwta: string;
@@ -103,7 +103,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ what, value }: {
                 what: string;
                 value: string;
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         isMoreThan: {
             gwta: string;
@@ -112,17 +112,17 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ what, value }: {
                 what: string;
                 value: string;
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         exists: {
             gwta: string;
             handlesUndefined: string[];
-            action: ({ what }: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: ({ what }: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         showVar: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         showDomains: {
             gwta: string;
@@ -131,19 +131,19 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
         showDomain: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         isIn: {
             match: RegExp;
             fallback: true;
-            action: (_: unknown, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: unknown, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         matches: {
             gwta: string;
             action: ({ value, pattern }: {
                 value: string;
                 pattern: string;
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
     };
     readonly typedSteps: {
@@ -153,7 +153,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ domain, superdomains }: {
                 domain: string;
                 superdomains: TFeatureStep[];
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         defineOrderedSet: {
             precludes: string[];
@@ -162,7 +162,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ domain, values }: {
                 domain: string;
                 values: TFeatureStep[];
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         defineValuesSet: {
             gwta: string;
@@ -170,7 +170,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ domain, values }: {
                 domain: string;
                 values: TFeatureStep[];
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         statementSetValues: {
             expose: false;
@@ -193,7 +193,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
         increment: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         showEnv: {
             gwta: string;
@@ -234,7 +234,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
         is: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         isLessThan: {
             gwta: string;
@@ -243,7 +243,7 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ what, value }: {
                 what: string;
                 value: string;
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         isMoreThan: {
             gwta: string;
@@ -252,17 +252,17 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
             action: ({ what, value }: {
                 what: string;
                 value: string;
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         exists: {
             gwta: string;
             handlesUndefined: string[];
-            action: ({ what }: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: ({ what }: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         showVar: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         showDomains: {
             gwta: string;
@@ -271,22 +271,22 @@ declare class VariablesStepper extends AStepper implements IHasCycles {
         showDomain: {
             gwta: string;
             handlesUndefined: string[];
-            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: TStepArgs, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         isIn: {
             match: RegExp;
             fallback: true;
-            action: (_: unknown, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            action: (_: unknown, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
         matches: {
             gwta: string;
             action: ({ value, pattern }: {
                 value: string;
                 pattern: string;
-            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+            }, featureStep: TFeatureStep) => import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
         };
     };
-    compareValues(featureStep: TFeatureStep, rawTerm: string, value: string, operator: string): import("../schema/protocol.js").TOKActionResult | import("../schema/protocol.js").TNotOKActionResult;
+    compareValues(featureStep: TFeatureStep, rawTerm: string, value: string, operator: string): import("../schema/protocol.js").TNotOKActionResult | import("../schema/protocol.js").TOKActionResult;
     /**
      * Interpolates a template string by replacing {varName} placeholders with variable values.
      * Returns the interpolated string or an error if a variable is not found.

package/build/steps/variables-stepper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"variables-stepper.d.ts","sourceRoot":"","sources":["../../src/steps/variables-stepper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"variables-stepper.d.ts","sourceRoot":"","sources":["../../src/steps/variables-stepper.ts"],"names":[],"mappings":"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"}

package/build/steps/variables-stepper.js

@@ -2,9 +2,9 @@ import { z } from 'zod';
 import { OK, Origin } from '../schema/protocol.js';
 import { AStepper } from '../lib/astepper.js';
 import { actionOK, actionNotOK, getStepTerm } from '../lib/util/index.js';
-import { FeatureVariables } from '../lib/feature-variables.js';
+import { FeatureVariables, OBSCURED_VALUE } from '../lib/feature-variables.js';
+import { sanitizeObjectSecrets, hideValueIfSecret } from '../lib/util/secret-utils.js';
 import { DOMAIN_STATEMENT, DOMAIN_STRING, normalizeDomainKey, createEnumDomainDefinition, registerDomains } from '../lib/domain-types.js';
-import { OBSCURED_VALUE } from '../lib/EventLogger.js';
 const clearVars = (vars) => () => {
     vars.getWorld().shared.clear();
     return;
@@ -59,7 +59,7 @@ class VariablesStepper extends AStepper {
                 const result = this.interpolateTemplate(templateVal.term, featureStep);
                 if (result.error)
                     return actionNotOK(result.error);
-                return trySetVariable(this.getWorld().shared, { term: String(term), value: result.value, domain, origin: Origin.var }, provenanceFromFeatureStep(featureStep));
+                return trySetVariable(this.getWorld().shared, { term: String(term), value: result.value, domain, origin: Origin.var, secret: result.secret }, provenanceFromFeatureStep(featureStep));
             }
         },
         compose: {
@@ -73,19 +73,19 @@ class VariablesStepper extends AStepper {
                 const result = this.interpolateTemplate(templateVal.term, featureStep);
                 if (result.error)
                     return actionNotOK(result.error);
-                return trySetVariable(this.getWorld().shared, { term: String(term), value: result.value, domain: DOMAIN_STRING, origin: Origin.var }, provenanceFromFeatureStep(featureStep));
-            }
+                return trySetVariable(this.getWorld().shared, { term: String(term), value: result.value, domain: DOMAIN_STRING, origin: Origin.var, secret: result.secret }, provenanceFromFeatureStep(featureStep));
+            },
         },
         increment: {
             gwta: 'increment {what}',
             handlesUndefined: ['what'],
             action: (_, featureStep) => {
-                const { term: rawTerm, domain } = featureStep.action.stepValuesMap.what;
+                const { term: rawTerm } = featureStep.action.stepValuesMap.what;
                 const interpolated = this.interpolateTemplate(rawTerm, featureStep);
                 if (interpolated.error)
                     return actionNotOK(interpolated.error);
                 const term = interpolated?.value;
-                const resolved = this.getWorld().shared.resolveVariable({ term, origin: Origin.var, domain }, featureStep);
+                const resolved = this.getWorld().shared.resolveVariable({ term, origin: Origin.var }, featureStep);
                 const presentVal = resolved.value;
                 const effectiveDomain = resolved.domain;
                 if (presentVal === undefined) {
@@ -130,11 +130,9 @@ class VariablesStepper extends AStepper {
             action: () => {
                 // Obscure secret environment variables (matching /password/i)
                 const envVars = this.world.options.envVariables || {};
-                const displayEnv = {};
-                for (const [key, value] of Object.entries(envVars)) {
-                    displayEnv[key] = /password/i.test(key) ? OBSCURED_VALUE : String(value ?? '');
-                }
-                console.info('env', displayEnv);
+                const shared = this.getWorld().shared;
+                const safeEnv = sanitizeObjectSecrets(envVars, (key) => shared.isSecret(key), Object.values(shared.getSecrets()));
+                this.getWorld().eventLogger.info(`env: ${JSON.stringify(safeEnv, null, 2)}`, { env: safeEnv });
                 return Promise.resolve(OK);
             }
         },
@@ -142,8 +140,9 @@ class VariablesStepper extends AStepper {
             gwta: 'show vars',
             action: () => {
                 const shared = this.getWorld().shared;
-                const displayVars = Object.fromEntries(Object.entries(shared.all()).map(([k, v]) => [k, shared.isSecret(k) ? OBSCURED_VALUE : v.value]));
-                this.getWorld().eventLogger.info(`vars: ${JSON.stringify(displayVars, null, 2)}`, { vars: displayVars });
+                const displayVars = Object.fromEntries(Object.entries(shared.all()).map(([key, variable]) => [key, variable.value]));
+                const safeVars = sanitizeObjectSecrets(displayVars, (key) => shared.isSecret(key), Object.values(shared.getSecrets()));
+                this.getWorld().eventLogger.info(`vars: ${JSON.stringify(safeVars, null, 2)}`, { vars: safeVars });
                 return actionOK();
             },
         },
@@ -153,7 +152,7 @@ class VariablesStepper extends AStepper {
             precludes: ['Haibun.prose'],
             action: (args, featureStep) => {
                 const { term: rawTerm, domain, origin } = featureStep.action.stepValuesMap.what;
-                const parsedValue = this.getWorld().shared.resolveVariable(featureStep.action.stepValuesMap.value, featureStep);
+                const parsedValue = this.getWorld().shared.resolveVariable(featureStep.action.stepValuesMap.value, featureStep, undefined, { secure: true });
                 if (parsedValue.value === undefined)
                     return actionNotOK(`Variable ${featureStep.action.stepValuesMap.value.term} not found`);
                 const resolved = { value: String(parsedValue.value) };
@@ -167,7 +166,7 @@ class VariablesStepper extends AStepper {
                 // Inherit domain from existing variable if not explicitly specified
                 const existing = this.getWorld().shared.resolveVariable({ term, origin: Origin.var }, featureStep);
                 const effectiveDomain = (domain === DOMAIN_STRING && existing?.domain) ? existing.domain : (domain || DOMAIN_STRING);
-                const result = trySetVariable(this.getWorld().shared, { term, value: resolved.value, domain: effectiveDomain, origin }, provenanceFromFeatureStep(featureStep));
+                const result = trySetVariable(this.getWorld().shared, { term, value: resolved.value, domain: effectiveDomain, origin, secret: interpolated.secret || parsedValue.secret }, provenanceFromFeatureStep(featureStep));
                 return result;
             }
         },
@@ -177,9 +176,8 @@ class VariablesStepper extends AStepper {
             precludes: [`${VariablesStepper.name}.set`],
             action: ({ value, domain }, featureStep) => {
                 const readonly = !!featureStep.in.match(/ as read-only /);
-                const secret = !!featureStep.in.match(/ as secret /);
                 const { term: rawTerm, origin } = featureStep.action.stepValuesMap.what;
-                const parsedValue = this.getWorld().shared.resolveVariable(featureStep.action.stepValuesMap.value, featureStep);
+                const parsedValue = this.getWorld().shared.resolveVariable(featureStep.action.stepValuesMap.value, featureStep, undefined, { secure: true });
                 if (parsedValue.value === undefined)
                     return actionNotOK(`Variable ${featureStep.action.stepValuesMap.value.term} not found`);
                 const resolved = { value: String(parsedValue.value) };
@@ -196,9 +194,6 @@ class VariablesStepper extends AStepper {
                     if (effectiveDomain.startsWith('read-only ')) {
                         effectiveDomain = effectiveDomain.replace('read-only ', '');
                     }
-                    if (effectiveDomain.startsWith('secret ')) {
-                        effectiveDomain = effectiveDomain.replace('secret ', '');
-                    }
                     if (effectiveDomain.startsWith('"') && effectiveDomain.endsWith('"')) {
                         effectiveDomain = effectiveDomain.slice(1, -1);
                     }
@@ -207,7 +202,7 @@ class VariablesStepper extends AStepper {
                 if (typeof finalValue === 'string' && finalValue.startsWith('"') && finalValue.endsWith('"')) {
                     finalValue = finalValue.slice(1, -1);
                 }
-                return trySetVariable(this.getWorld().shared, { term, value: finalValue, domain: effectiveDomain, origin, readonly, secret }, provenanceFromFeatureStep(featureStep));
+                return trySetVariable(this.getWorld().shared, { term, value: finalValue, domain: effectiveDomain, origin, readonly, secret: interpolated.secret || parsedValue.secret }, provenanceFromFeatureStep(featureStep));
             }
         },
         unset: {
@@ -247,18 +242,17 @@ class VariablesStepper extends AStepper {
                 if (interpolated.error)
                     return actionNotOK(interpolated.error);
                 const term = interpolated.value;
-                const resolved = this.getWorld().shared.resolveVariable({ term, origin: Origin.defined }, featureStep);
-                if (resolved.value === undefined) {
+                const resolved = this.getWorld().shared.resolveVariable({ term, origin: Origin.defined }, featureStep, undefined, { secure: true });
+                if (resolved.value === undefined || (resolved.origin !== Origin.var && resolved.origin !== Origin.env)) {
                     return actionNotOK(`${term} is not set`);
                 }
-                const storedVal = resolved.value;
-                const parsedValue = this.getWorld().shared.resolveVariable(featureStep.action.stepValuesMap.value, featureStep);
+                const parsedValue = this.getWorld().shared.resolveVariable(featureStep.action.stepValuesMap.value, featureStep, undefined, { secure: true });
                 if (parsedValue.value === undefined)
                     return actionNotOK(`Variable ${featureStep.action.stepValuesMap.value.term} not found`);
                 const value = String(parsedValue.value);
                 const domainKey = normalizeDomainKey(resolved.domain);
                 const compareVal = this.getWorld().domains[domainKey].coerce({ term: '_cmp', value, domain: domainKey, origin: Origin.quoted }, featureStep, this.steppers);
-                return JSON.stringify(storedVal) === JSON.stringify(compareVal) ? OK : actionNotOK(`${term} is ${JSON.stringify(storedVal)}, not ${JSON.stringify(compareVal)}`);
+                return JSON.stringify(resolved.value) === JSON.stringify(compareVal) ? OK : actionNotOK(`${term} is ${JSON.stringify(resolved.value)}, not ${JSON.stringify(compareVal)}`);
             }
         },
         isLessThan: {
@@ -284,8 +278,11 @@ class VariablesStepper extends AStepper {
             handlesUndefined: ['what'],
             action: ({ what }, featureStep) => {
                 const term = (getStepTerm(featureStep, 'what') ?? what);
-                const resolved = this.getWorld().shared.resolveVariable({ term, origin: Origin.defined }, featureStep);
-                return resolved && (resolved.origin === Origin.var || resolved.origin === Origin.env) ? OK : actionNotOK(`${what} not set`);
+                const sharedVars = this.getWorld().shared.all();
+                if (sharedVars[term])
+                    return OK;
+                const envVars = this.getWorld().options.envVariables || {};
+                return envVars[term] !== undefined ? OK : actionNotOK(`${what} not set`);
             }
         },
         showVar: {
@@ -299,13 +296,15 @@ class VariablesStepper extends AStepper {
                 if (interpolated.error)
                     return actionNotOK(interpolated.error);
                 const term = interpolated.value || '';
-                const stepValue = this.getWorld().shared.resolveVariable({ term, origin: Origin.defined }, featureStep);
-                const isSecret = this.getWorld().shared.isSecret(term);
+                const shared = this.getWorld().shared;
+                const stepValue = shared.resolveVariable({ term, origin: Origin.defined }, featureStep);
+                const isSecret = shared.isSecret(term);
+                const maskedValue = hideValueIfSecret(stepValue.value, Object.values(shared.getSecrets()));
                 if (stepValue.value === undefined) {
                     this.getWorld().eventLogger.info(`${term} is undefined`);
                 }
                 else {
-                    const displayValue = isSecret ? { ...stepValue, value: OBSCURED_VALUE } : stepValue;
+                    const displayValue = (isSecret || maskedValue === OBSCURED_VALUE) ? { ...stepValue, value: OBSCURED_VALUE } : stepValue;
                     const provenance = featureStep.action.stepValuesMap.what.provenance?.map((p, i) => ({ [i]: { in: p.in, seq: p.seq.join(','), when: p.when } }));
                     this.getWorld().eventLogger.info(`${term} is ${JSON.stringify({ ...displayValue, provenance }, null, 2)}`, { variable: term, value: displayValue });
                 }
@@ -385,8 +384,8 @@ class VariablesStepper extends AStepper {
                     valueTerm = valueTerm.slice(1, -1);
                 }
                 // Try to resolve as variable, fall back to literal
-                const resolved = this.getWorld().shared.resolveVariable({ term: valueTerm, origin: Origin.defined });
-                const actualValue = resolved?.value !== undefined ? String(resolved.value) : valueTerm;
+                const resolvedValue = this.getWorld().shared.get(valueTerm, true);
+                const actualValue = resolvedValue !== undefined ? String(resolvedValue) : valueTerm;
                 const domainName = matchResult[2].trim();
                 const domainKey = normalizeDomainKey(domainName);
                 const domainDef = this.getWorld().domains[domainKey];
@@ -422,8 +421,8 @@ class VariablesStepper extends AStepper {
                     return actionNotOK(interpolatedValue.error);
                 const term = interpolatedValue.value;
                 // Resolve value as a variable (e.g., "WebPlaywright/currentURI" -> actual URL)
-                const resolved = this.getWorld().shared.resolveVariable({ term, origin: Origin.defined }, featureStep);
-                const actualValue = resolved.value !== undefined ? String(resolved.value) : String(term);
+                const resolvedValue = this.getWorld().shared.get(term, true);
+                const actualValue = resolvedValue !== undefined ? String(resolvedValue) : String(term);
                 // Interpolate variables in pattern (e.g., "{counter URI}*" -> "http://localhost:8123/*")
                 const interpolated = this.interpolateTemplate(pattern, featureStep);
                 if (interpolated.error)
@@ -447,7 +446,7 @@ class VariablesStepper extends AStepper {
         if (interpolated.error)
             return actionNotOK(interpolated.error);
         const term = interpolated.value;
-        const stored = this.getWorld().shared.resolveVariable({ term, origin: Origin.var }, featureStep);
+        const stored = this.getWorld().shared.resolveVariable({ term, origin: Origin.var }, featureStep, this.steppers, { secure: true });
         if (!stored) {
             return actionNotOK(`${term} is not set`);
         }
@@ -485,15 +484,20 @@ class VariablesStepper extends AStepper {
         const placeholderRegex = /\{([^}]+)\}/g;
         let result = template;
         let match;
+        let secret = false;
         while ((match = placeholderRegex.exec(template)) !== null) {
             const varName = match[1];
-            const resolved = this.getWorld().shared.resolveVariable({ term: varName, origin: Origin.defined }, featureStep);
+            // Check if it's secret BEFORE resolving it securely so we know
+            if (this.getWorld().shared.isSecret(varName)) {
+                secret = true;
+            }
+            const resolved = this.getWorld().shared.resolveVariable({ term: varName, origin: Origin.defined }, featureStep, undefined, { secure: true });
             if (resolved.value === undefined) {
                 return { error: `Variable ${varName} not found` };
             }
             result = result.replace(match[0], String(resolved.value));
         }
-        return { value: result };
+        return { value: result, secret };
     }
     registerSubdomainFromStatement(domain, superdomains, featureStep) {
         try {
@@ -631,12 +635,12 @@ const compareDomainValues = (domain, left, right, domainName) => {
 // ======== Helpers ========
 // Returns OK if "set empty" and variable exists
 function shouldSkipEmpty(featureStep, term, shared) {
-    return (featureStep.in.includes('set empty ') && shared.get(term) !== undefined) ? OK : undefined;
+    return (featureStep.in.includes('set empty ') && shared.resolveVariable({ term, origin: Origin.var }, featureStep, undefined, { secure: true }).value !== undefined) ? OK : undefined;
 }
 // Wraps shared.set in try/catch
 function trySetVariable(shared, opts, provenance) {
     try {
-        shared.set({ term: String(opts.term), value: opts.value, domain: opts.domain, origin: opts.origin, readonly: opts.readonly, secret: opts.secret }, provenance);
+        shared.set({ term: opts.term, value: opts.value, domain: opts.domain, origin: opts.origin, readonly: opts.readonly, secret: opts.secret }, provenance);
         return OK;
     }
     catch (e) {