rebase fixes

Author: tim-smart

packages/cli/src/internal/prompt/multi-select.ts

@@ -294,7 +294,7 @@ function handleProcess<A>(options: SelectOptions<A> & MultiSelectOptions) {
 
 function handleRender<A>(options: SelectOptions<A>) {
   return (state: State, action: Prompt.Prompt.Action<State, Array<A>>) => {
-    return Action.$match(action, {
+    return Action.match(action, {
       Beep: () => Effect.succeed(renderBeep),
       NextFrame: ({ state }) => renderNextFrame(state, options),
       Submit: () => renderSubmission(state, options)

packages/effect/src/internal/config.ts

@@ -426,12 +426,11 @@ export const repeat = <A>(self: Config.Config<A>): Config.Config<Array<A>> => {
 }
 
 /** @internal */
-export const redacted = (name?: string): Config.Config<Redacted.Redacted> => {
-  const config = primitive(
-    "a redacted property",
-    (text) => Either.right(redacted_.make(text))
-  )
-  return name === undefined ? config : nested(config, name)
+export const redacted = <A>(
+  nameOrConfig?: string | Config.Config<A>
+): Config.Config<Redacted.Redacted<A | string>> => {
+  const config: Config.Config<A | string> = isConfig(nameOrConfig) ? nameOrConfig : string(nameOrConfig)
+  return map(config, redacted_.make)
 }
 
 /** @internal */