@microsoft/teamsfx-core 3.0.15 → 3.0.16-alpha.3fe313aeb8.0

package/build/v4/buildTarget/parseSelector.js

@@ -7,6 +7,7 @@ exports.parseSelectorSpec = parseSelectorSpec;
 exports.parseSelectorPresentation = parseSelectorPresentation;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const neverthrow_1 = require("neverthrow");
+const evaluateExpression_1 = require("../expression/evaluateExpression");
 /** Parse raw selector JSON into routing and presentation projections. See resolve-build-target spec. */
 const SOURCE = "Scaffold";
 /** `UserError` name for malformed selector JSON. */
@@ -31,65 +32,54 @@ function stringArray(value) {
 }
 /** Membership test for the closed dispatch-engine set. */
 function isDispatchEngine(value) {
-    return (value === "v4" || value === "v3" || value === "v3-core-method" || value === "surface-action");
-}
-/** Structural check for the authored `ExpressionNode` union. */
-function isExpressionNode(value) {
-    if (!isRecord(value)) {
-        return false;
-    }
-    return (typeof value.expr === "string" ||
-        typeof value.from === "string" ||
-        typeof value.featureFlag === "string" ||
-        typeof value.capability === "string" ||
-        isRecord(value.equals) ||
-        isRecord(value.enum) ||
-        Array.isArray(value.anyOf));
+    return value === "v4" || value === "surface-action";
 }
 /** Project one raw question onto `{ name, condition? }`. */
-function parseQuestion(raw) {
+function parseQuestion(raw, index) {
     if (!isRecord(raw)) {
-        return (0, neverthrow_1.err)(userError("a selector question must be an object"));
+        return (0, neverthrow_1.err)(userError(`selector question at index ${index} must be an object`));
     }
     const name = stringField(raw, "name");
     if (name === undefined) {
-        return (0, neverthrow_1.err)(userError("a selector question must have a string 'name'"));
+        return (0, neverthrow_1.err)(userError(`selector question at index ${index} must have a string 'name'`));
     }
     const condition = raw.condition;
     if (condition === undefined) {
         return (0, neverthrow_1.ok)({ name });
     }
-    if (!isExpressionNode(condition)) {
-        return (0, neverthrow_1.err)(userError(`selector question '${name}' has a malformed 'condition'`));
+    if (!(0, evaluateExpression_1.isExpressionNode)(condition)) {
+        return (0, neverthrow_1.err)(userError(`selector question at index ${index} has a malformed 'condition'`));
     }
     return (0, neverthrow_1.ok)({ name, condition });
 }
 /** Project one raw route onto `{ when, engine, +engine-key? }`. */
-function parseRoute(raw) {
+function parseRoute(raw, index) {
     if (!isRecord(raw)) {
-        return (0, neverthrow_1.err)(userError("a selector route must be an object"));
+        return (0, neverthrow_1.err)(userError(`selector route at index ${index} must be an object`));
     }
     const when = stringField(raw, "when");
     if (when === undefined) {
-        return (0, neverthrow_1.err)(userError("a selector route must have a string 'when'"));
+        return (0, neverthrow_1.err)(userError(`selector route at index ${index} must have a string 'when'`));
     }
     const engine = raw.engine;
     if (!isDispatchEngine(engine)) {
-        return (0, neverthrow_1.err)(userError(`selector route '${when}' has an invalid 'engine'`));
+        return (0, neverthrow_1.err)(userError(`selector route at index ${index} has an invalid 'engine'`));
     }
     const route = { when, engine };
+    for (const key of ["templateId", "action"]) {
+        if (key in raw && typeof raw[key] !== "string") {
+            return (0, neverthrow_1.err)(userError(`selector route at index ${index} has a non-string '${key}'`));
+        }
+    }
+    if ("surfaces" in raw &&
+        (!Array.isArray(raw.surfaces) ||
+            !raw.surfaces.every((surface) => typeof surface === "string"))) {
+        return (0, neverthrow_1.err)(userError(`selector route at index ${index} has invalid 'surfaces'`));
+    }
     const templateId = stringField(raw, "templateId");
     if (templateId !== undefined) {
         route.templateId = templateId;
     }
-    const v3Adapter = stringField(raw, "v3Adapter");
-    if (v3Adapter !== undefined) {
-        route.v3Adapter = v3Adapter;
-    }
-    const coreMethod = stringField(raw, "coreMethod");
-    if (coreMethod !== undefined) {
-        route.coreMethod = coreMethod;
-    }
     const action = stringField(raw, "action");
     if (action !== undefined) {
         route.action = action;
@@ -112,16 +102,16 @@ function parseSelectorSpec(raw) {
         return (0, neverthrow_1.err)(userError("selector.json 'routes' must be an array"));
     }
     const questions = [];
-    for (const rawQuestion of raw.questions) {
-        const parsed = parseQuestion(rawQuestion);
+    for (let index = 0; index < raw.questions.length; index++) {
+        const parsed = parseQuestion(raw.questions[index], index);
         if (parsed.isErr()) {
             return (0, neverthrow_1.err)(parsed.error);
         }
         questions.push(parsed.value);
     }
     const routes = [];
-    for (const rawRoute of raw.routes) {
-        const parsed = parseRoute(rawRoute);
+    for (let index = 0; index < raw.routes.length; index++) {
+        const parsed = parseRoute(raw.routes[index], index);
         if (parsed.isErr()) {
             return (0, neverthrow_1.err)(parsed.error);
         }
@@ -130,17 +120,17 @@ function parseSelectorSpec(raw) {
     return (0, neverthrow_1.ok)({ questions, routes });
 }
 /** Project one raw option onto its presentation shape. */
-function parsePresentationOption(raw) {
+function parsePresentationOption(raw, questionIndex, optionIndex) {
     if (!isRecord(raw)) {
-        return (0, neverthrow_1.err)(userError("a selector option must be an object"));
+        return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} option at index ${optionIndex} must be an object`));
     }
     const id = stringField(raw, "id");
     if (id === undefined) {
-        return (0, neverthrow_1.err)(userError("a selector option must have a string 'id'"));
+        return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} option at index ${optionIndex} must have a string 'id'`));
     }
     const label = stringField(raw, "label");
     if (label === undefined) {
-        return (0, neverthrow_1.err)(userError(`selector option '${id}' must have a string 'label'`));
+        return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} option at index ${optionIndex} must have a string 'label'`));
     }
     const option = { id, label };
     const detail = stringField(raw, "detail");
@@ -151,23 +141,31 @@ function parsePresentationOption(raw) {
     if (groupName !== undefined) {
         option.groupName = groupName;
     }
+    const iconPath = stringField(raw, "iconPath");
+    if (iconPath !== undefined) {
+        option.iconPath = iconPath;
+    }
+    const keyPrefix = stringField(raw, "keyPrefix");
+    if (keyPrefix !== undefined) {
+        option.keyPrefix = keyPrefix;
+    }
     const condition = raw.condition;
     if (condition !== undefined) {
-        if (!isExpressionNode(condition)) {
-            return (0, neverthrow_1.err)(userError(`selector option '${id}' has a malformed 'condition'`));
+        if (!(0, evaluateExpression_1.isExpressionNode)(condition)) {
+            return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} option at index ${optionIndex} has a malformed 'condition'`));
         }
         option.condition = condition;
     }
     return (0, neverthrow_1.ok)(option);
 }
 /** Project one raw question onto its presentation shape. */
-function parsePresentationQuestion(raw) {
+function parsePresentationQuestion(raw, questionIndex) {
     if (!isRecord(raw)) {
-        return (0, neverthrow_1.err)(userError("a selector question must be an object"));
+        return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} must be an object`));
     }
     const name = stringField(raw, "name");
     if (name === undefined) {
-        return (0, neverthrow_1.err)(userError("a selector question must have a string 'name'"));
+        return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} must have a string 'name'`));
     }
     const question = { name, staticOptions: [] };
     const title = stringField(raw, "title");
@@ -178,12 +176,23 @@ function parsePresentationQuestion(raw) {
     if (placeholder !== undefined) {
         question.placeholder = placeholder;
     }
+    const keyPrefix = stringField(raw, "keyPrefix");
+    if (keyPrefix !== undefined) {
+        question.keyPrefix = keyPrefix;
+    }
+    const condition = raw.condition;
+    if (condition !== undefined) {
+        if (!(0, evaluateExpression_1.isExpressionNode)(condition)) {
+            return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} has a malformed 'condition'`));
+        }
+        question.condition = condition;
+    }
     if (raw.staticOptions !== undefined) {
         if (!Array.isArray(raw.staticOptions)) {
-            return (0, neverthrow_1.err)(userError(`selector question '${name}' has a non-array 'staticOptions'`));
+            return (0, neverthrow_1.err)(userError(`selector question at index ${questionIndex} has a non-array 'staticOptions'`));
         }
-        for (const rawOption of raw.staticOptions) {
-            const parsed = parsePresentationOption(rawOption);
+        for (let optionIndex = 0; optionIndex < raw.staticOptions.length; optionIndex++) {
+            const parsed = parsePresentationOption(raw.staticOptions[optionIndex], questionIndex, optionIndex);
             if (parsed.isErr()) {
                 return (0, neverthrow_1.err)(parsed.error);
             }
@@ -201,8 +210,8 @@ function parseSelectorPresentation(raw) {
         return (0, neverthrow_1.err)(userError("selector.json 'questions' must be an array"));
     }
     const questions = [];
-    for (const rawQuestion of raw.questions) {
-        const parsed = parsePresentationQuestion(rawQuestion);
+    for (let questionIndex = 0; questionIndex < raw.questions.length; questionIndex++) {
+        const parsed = parsePresentationQuestion(raw.questions[questionIndex], questionIndex);
         if (parsed.isErr()) {
             return (0, neverthrow_1.err)(parsed.error);
         }

package/build/v4/buildTarget/parseSelector.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseSelector.js","sourceRoot":"","sources":["../../../src/v4/buildTarget/parseSelector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseSelector.js","sourceRoot":"","sources":["../../../src/v4/buildTarget/parseSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAsGlC,8CA2BC;AAkJD,8DAgBC;AAjSD,wDAA4D;AAC5D,2CAA6C;AAC7C,yEAAmF;AAGnF,wGAAwG;AAExG,MAAM,MAAM,GAAG,UAAU,CAAC;AAE1B,oDAAoD;AACvC,QAAA,+BAA+B,GAAG,8BAA8B,CAAC;AAE9E,SAAS,SAAS,CAAC,OAAe;IAChC,OAAO,IAAI,uBAAS,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,uCAA+B,EAAE,OAAO,EAAE,CAAC,CAAC;AAC3F,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,gFAAgF;AAChF,SAAS,WAAW,CAAC,MAA+B,EAAE,GAAW;IAC/D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC;AAED,4FAA4F;AAC5F,SAAS,WAAW,CAAC,KAAc;IACjC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,EAAE,CAAC;QAC5F,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,0DAA0D;AAC1D,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,gBAAgB,CAAC;AACtD,CAAC;AAED,4DAA4D;AAC5D,SAAS,aAAa,CAAC,GAAY,EAAE,KAAa;IAChD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,8BAA8B,KAAK,oBAAoB,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACtC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,8BAA8B,KAAK,4BAA4B,CAAC,CAAC,CAAC;IACzF,CAAC;IACD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;IAChC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,IAAA,eAAE,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,IAAA,qCAAgB,EAAC,SAAS,CAAC,EAAE,CAAC;QACjC,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,8BAA8B,KAAK,8BAA8B,CAAC,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,IAAA,eAAE,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,mEAAmE;AACnE,SAAS,UAAU,CAAC,GAAY,EAAE,KAAa;IAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,2BAA2B,KAAK,oBAAoB,CAAC,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACtC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,2BAA2B,KAAK,4BAA4B,CAAC,CAAC,CAAC;IACtF,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,2BAA2B,KAAK,0BAA0B,CAAC,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,KAAK,GAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC9C,KAAK,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAU,EAAE,CAAC;QACpD,IAAI,GAAG,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YAC/C,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,2BAA2B,KAAK,sBAAsB,GAAG,GAAG,CAAC,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IACD,IACE,UAAU,IAAI,GAAG;QACjB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC3B,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAqB,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,EACnF,CAAC;QACD,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,2BAA2B,KAAK,yBAAyB,CAAC,CAAC,CAAC;IACnF,CAAC;IACD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAClD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;IAChC,CAAC;IACD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;IACxB,CAAC;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC5B,CAAC;IACD,OAAO,IAAA,eAAE,EAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAED,oEAAoE;AACpE,SAAgB,iBAAiB,CAAC,GAAY;IAC5C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,qCAAqC,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,yCAAyC,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,SAAS,GAAoB,EAAE,CAAC;IACtC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAC1D,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,OAAO,IAAA,gBAAG,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACvD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,OAAO,IAAA,gBAAG,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,IAAA,eAAE,EAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACnC,CAAC;AA8BD,0DAA0D;AAC1D,SAAS,uBAAuB,CAC9B,GAAY,EACZ,aAAqB,EACrB,WAAmB;IAEnB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAA,gBAAG,EACR,SAAS,CACP,8BAA8B,aAAa,oBAAoB,WAAW,oBAAoB,CAC/F,CACF,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAClC,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,OAAO,IAAA,gBAAG,EACR,SAAS,CACP,8BAA8B,aAAa,oBAAoB,WAAW,0BAA0B,CACrG,CACF,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,IAAA,gBAAG,EACR,SAAS,CACP,8BAA8B,aAAa,oBAAoB,WAAW,6BAA6B,CACxG,CACF,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAuB,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC1C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IACD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAC9C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IACD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;IAChC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAA,qCAAgB,EAAC,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,IAAA,gBAAG,EACR,SAAS,CACP,8BAA8B,aAAa,oBAAoB,WAAW,8BAA8B,CACzG,CACF,CAAC;QACJ,CAAC;QACD,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IACD,OAAO,IAAA,eAAE,EAAC,MAAM,CAAC,CAAC;AACpB,CAAC;AAED,4DAA4D;AAC5D,SAAS,yBAAyB,CAChC,GAAY,EACZ,aAAqB;IAErB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,8BAA8B,aAAa,oBAAoB,CAAC,CAAC,CAAC;IACzF,CAAC;IACD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACtC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,8BAA8B,aAAa,4BAA4B,CAAC,CAAC,CAAC;IACjG,CAAC;IACD,MAAM,QAAQ,GAAyB,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;IACnE,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;IACzB,CAAC;IACD,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,QAAQ,CAAC,WAAW,GAAG,WAAW,CAAC;IACrC,CAAC;IACD,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAChD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IACjC,CAAC;IACD,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;IAChC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAA,qCAAgB,EAAC,SAAS,CAAC,EAAE,CAAC;YACjC,OAAO,IAAA,gBAAG,EACR,SAAS,CAAC,8BAA8B,aAAa,8BAA8B,CAAC,CACrF,CAAC;QACJ,CAAC;QACD,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IACjC,CAAC;IACD,IAAI,GAAG,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,OAAO,IAAA,gBAAG,EACR,SAAS,CAAC,8BAA8B,aAAa,kCAAkC,CAAC,CACzF,CAAC;QACJ,CAAC;QACD,KAAK,IAAI,WAAW,GAAG,CAAC,EAAE,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC;YAChF,MAAM,MAAM,GAAG,uBAAuB,CACpC,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,EAC9B,aAAa,EACb,WAAW,CACZ,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBACnB,OAAO,IAAA,gBAAG,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;YACD,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,OAAO,IAAA,eAAE,EAAC,QAAQ,CAAC,CAAC;AACtB,CAAC;AAED,mEAAmE;AACnE,SAAgB,yBAAyB,CAAC,GAAY;IACpD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,qCAAqC,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,IAAA,gBAAG,EAAC,SAAS,CAAC,4CAA4C,CAAC,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,KAAK,IAAI,aAAa,GAAG,CAAC,EAAE,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC;QAClF,MAAM,MAAM,GAAG,yBAAyB,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;QACtF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,OAAO,IAAA,gBAAG,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,IAAA,eAAE,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AAC3B,CAAC"}

package/build/v4/buildTarget/resolveBuildTarget.d.ts

@@ -1,15 +1,14 @@
 import { FxError } from "@microsoft/teamsfx-api";
 import { Result } from "neverthrow";
+import { WalkHistoryEntry } from "../collectInputs/collectInputs";
 import { ExpressionNode } from "../expression/evaluateExpression";
-/** The four worlds dispatch can hand off to. */
-export type DispatchEngine = "v4" | "v3" | "v3-core-method" | "surface-action";
+/** The worlds dispatch can hand off to. */
+export type DispatchEngine = "v4" | "surface-action";
 /** One parsed `selector.json` route. */
 export interface SelectorRoute {
     when: string;
     engine: DispatchEngine;
     templateId?: string;
-    v3Adapter?: string;
-    coreMethod?: string;
     action?: string;
     surfaces?: string[];
 }
@@ -40,20 +39,26 @@ export interface RouteResolverPort {
     featureFlag(name: string): boolean;
     /** Membership test for the v4 world. */
     v4Registry(templateId: string): boolean;
-    /** Membership test for the frozen v3 generator allow-list. */
-    v3Registry(templateId: string): boolean;
-    /** Membership test for the frozen v3 core-method allow-list. */
-    v3CoreMethodRegistry(coreMethod: string): boolean;
 }
 /** The resolved dispatch outcome. */
 export interface BuildTarget {
-    /** The v4/v3 template id, core method, or surface action id. */
+    /** The v4 template id, core method, or surface action id. */
     templateId: string;
     /** Which world dispatch hands off to. */
     engine: DispatchEngine;
     /** The Q1 dimension picks that produced this target. */
     answers?: Record<string, string>;
 }
+/**
+ * A `BuildTarget` plus the Q1 walk state the front door retains for cross-phase
+ * back (a superset, so existing `BuildTarget` reads are unaffected). `history` is
+ * opaque to the front door — it is only handed back via `resume`; `promptCount`
+ * is the number of Q1 dimensions actually prompted (Q2's `baseStep`).
+ */
+export interface SelectorWalkResult extends BuildTarget {
+    history: WalkHistoryEntry[];
+    promptCount: number;
+}
 /** `UserError` name: a resolved/supplied `templateId` belongs to no world. */
 export declare const BUILD_TARGET_UNKNOWN_TEMPLATE = "BuildTargetUnknownTemplate";
 /** `UserError` name: a route carries the wrong engine-specific key set. */
@@ -66,6 +71,12 @@ export declare const BUILD_TARGET_NO_MATCHING_ROUTE = "BuildTargetNoMatchingRout
 export declare const BUILD_TARGET_MISSING_DIMENSION = "BuildTargetMissingDimension";
 /** `UserError` name: the user backed out of the first Q1 prompt. */
 export declare const BUILD_TARGET_WALK_CANCELLED = "BuildTargetWalkCancelled";
+/** Validate only a selector route's engine-specific key shape. */
+export declare function validateSelectorRouteShape(route: SelectorRoute): Result<void, FxError>;
 /** Resolve a create/modify selector walk into a dispatched `BuildTarget`. */
-export declare function resolveBuildTarget(selector: SelectorSpec, prefilled: Record<string, string>, interactive: boolean, port: RouteResolverPort): Promise<Result<BuildTarget, FxError>>;
+export declare function resolveBuildTarget(selector: SelectorSpec, prefilled: Record<string, string>, interactive: boolean, port: RouteResolverPort, options?: {
+    resume?: {
+        history: WalkHistoryEntry[];
+    };
+}): Promise<Result<SelectorWalkResult, FxError>>;
 //# sourceMappingURL=resolveBuildTarget.d.ts.map

package/build/v4/buildTarget/resolveBuildTarget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveBuildTarget.d.ts","sourceRoot":"","sources":["../../../src/v4/buildTarget/resolveBuildTarget.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAa,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAC7C,OAAO,EACL,cAAc,EAKf,MAAM,kCAAkC,CAAC;AAM1C,gDAAgD;AAChD,MAAM,MAAM,cAAc,GAAG,IAAI,GAAG,IAAI,GAAG,gBAAgB,GAAG,gBAAgB,CAAC;AAE/E,wCAAwC;AACxC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AAED,2CAA2C;AAC3C,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED,oEAAoE;AACpE,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,YAAY,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAQ/F;AAED,yCAAyC;AACzC,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,+FAA+F;AAC/F,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACrE,iFAAiF;IACjF,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,wCAAwC;IACxC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;IACxC,8DAA8D;IAC9D,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;IACxC,gEAAgE;IAChE,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;CACnD;AAED,qCAAqC;AACrC,MAAM,WAAW,WAAW;IAC1B,gEAAgE;IAChE,UAAU,EAAE,MAAM,CAAC;IACnB,yCAAyC;IACzC,MAAM,EAAE,cAAc,CAAC;IACvB,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,8EAA8E;AAC9E,eAAO,MAAM,6BAA6B,+BAA+B,CAAC;AAC1E,2EAA2E;AAC3E,eAAO,MAAM,4BAA4B,8BAA8B,CAAC;AACxE,uEAAuE;AACvE,eAAO,MAAM,8BAA8B,+BAA+B,CAAC;AAC3E,yEAAyE;AACzE,eAAO,MAAM,8BAA8B,+BAA+B,CAAC;AAC3E,2EAA2E;AAC3E,eAAO,MAAM,8BAA8B,gCAAgC,CAAC;AAC5E,oEAAoE;AACpE,eAAO,MAAM,2BAA2B,6BAA6B,CAAC;AA8MtE,6EAA6E;AAC7E,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAwBvC"}
+{"version":3,"file":"resolveBuildTarget.d.ts","sourceRoot":"","sources":["../../../src/v4/buildTarget/resolveBuildTarget.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAA0B,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAC7C,OAAO,EAKL,gBAAgB,EAEjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,cAAc,EAKf,MAAM,kCAAkC,CAAC;AAM1C,2CAA2C;AAC3C,MAAM,MAAM,cAAc,GAAG,IAAI,GAAG,gBAAgB,CAAC;AAErD,wCAAwC;AACxC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AAED,2CAA2C;AAC3C,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED,oEAAoE;AACpE,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,YAAY,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAQ/F;AAED,yCAAyC;AACzC,MAAM,MAAM,YAAY,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,+FAA+F;AAC/F,MAAM,WAAW,iBAAiB;IAChC,oEAAoE;IACpE,MAAM,CAAC,QAAQ,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACrE,iFAAiF;IACjF,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,wCAAwC;IACxC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;CACzC;AAED,qCAAqC;AACrC,MAAM,WAAW,WAAW;IAC1B,6DAA6D;IAC7D,UAAU,EAAE,MAAM,CAAC;IACnB,yCAAyC;IACzC,MAAM,EAAE,cAAc,CAAC;IACvB,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;GAKG;AACH,MAAM,WAAW,kBAAmB,SAAQ,WAAW;IACrD,OAAO,EAAE,gBAAgB,EAAE,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,8EAA8E;AAC9E,eAAO,MAAM,6BAA6B,+BAA+B,CAAC;AAC1E,2EAA2E;AAC3E,eAAO,MAAM,4BAA4B,8BAA8B,CAAC;AACxE,uEAAuE;AACvE,eAAO,MAAM,8BAA8B,+BAA+B,CAAC;AAC3E,yEAAyE;AACzE,eAAO,MAAM,8BAA8B,+BAA+B,CAAC;AAC3E,2EAA2E;AAC3E,eAAO,MAAM,8BAA8B,gCAAgC,CAAC;AAC5E,oEAAoE;AACpE,eAAO,MAAM,2BAA2B,6BAA6B,CAAC;AAoDtE,kEAAkE;AAClE,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAKtF;AAyMD,6EAA6E;AAC7E,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,WAAW,EAAE,OAAO,EACpB,IAAI,EAAE,iBAAiB,EACvB,OAAO,GAAE;IAAE,MAAM,CAAC,EAAE;QAAE,OAAO,EAAE,gBAAgB,EAAE,CAAA;KAAE,CAAA;CAAO,GACzD,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC,CA8B9C"}

package/build/v4/buildTarget/resolveBuildTarget.js

@@ -4,9 +4,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BUILD_TARGET_WALK_CANCELLED = exports.BUILD_TARGET_MISSING_DIMENSION = exports.BUILD_TARGET_NO_MATCHING_ROUTE = exports.BUILD_TARGET_DANGLING_V4_ROUTE = exports.BUILD_TARGET_MALFORMED_ROUTE = exports.BUILD_TARGET_UNKNOWN_TEMPLATE = void 0;
 exports.v4RouteRegistryFromSelector = v4RouteRegistryFromSelector;
+exports.validateSelectorRouteShape = validateSelectorRouteShape;
 exports.resolveBuildTarget = resolveBuildTarget;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const neverthrow_1 = require("neverthrow");
+const collectInputs_1 = require("../collectInputs/collectInputs");
 const evaluateExpression_1 = require("../expression/evaluateExpression");
 /** v4 selector resolution. See resolve-build-target spec and ADR-0014. */
 const SOURCE = "Scaffold";
@@ -57,8 +59,6 @@ function buildScope(declared, answers) {
 function malformedRouteReason(r) {
     const has = {
         templateId: r.templateId !== undefined,
-        v3Adapter: r.v3Adapter !== undefined,
-        coreMethod: r.coreMethod !== undefined,
         action: r.action !== undefined,
     };
     switch (r.engine) {
@@ -66,42 +66,33 @@ function malformedRouteReason(r) {
             if (!has.templateId) {
                 return "engine 'v4' requires 'templateId'";
             }
-            if (has.v3Adapter || has.coreMethod || has.action) {
-                return "engine 'v4' must not carry 'v3Adapter' / 'coreMethod' / 'action'";
-            }
-            return undefined;
-        case "v3":
-            if (!has.v3Adapter) {
-                return "engine 'v3' requires 'v3Adapter'";
-            }
-            if (has.coreMethod || has.action) {
-                return "engine 'v3' must not carry 'coreMethod' / 'action'";
-            }
-            return undefined;
-        case "v3-core-method":
-            if (!has.coreMethod) {
-                return "engine 'v3-core-method' requires 'coreMethod'";
-            }
-            if (has.templateId || has.v3Adapter || has.action) {
-                return "engine 'v3-core-method' must not carry 'templateId' / 'v3Adapter' / 'action'";
+            if (has.action) {
+                return "engine 'v4' must not carry 'action'";
             }
             return undefined;
         case "surface-action":
             if (!has.action) {
                 return "engine 'surface-action' requires 'action'";
             }
-            if (has.templateId || has.v3Adapter || has.coreMethod) {
-                return "engine 'surface-action' must not carry 'templateId' / 'v3Adapter' / 'coreMethod'";
+            if (has.templateId) {
+                return "engine 'surface-action' must not carry 'templateId'";
             }
             return undefined;
     }
 }
+/** Validate only a selector route's engine-specific key shape. */
+function validateSelectorRouteShape(route) {
+    const reason = malformedRouteReason(route);
+    return reason === undefined
+        ? (0, neverthrow_1.ok)(undefined)
+        : (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_MALFORMED_ROUTE, `selector route has invalid shape: ${reason}`));
+}
 /** Validate the routing table before matching any route. */
 function validateRoutes(routes, port) {
     for (const r of routes) {
-        const reason = malformedRouteReason(r);
-        if (reason !== undefined) {
-            return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_MALFORMED_ROUTE, `route '${r.when}': ${reason}`));
+        const shape = validateSelectorRouteShape(r);
+        if (shape.isErr()) {
+            return (0, neverthrow_1.err)(shape.error);
         }
         if (r.engine === "v4" && r.templateId !== undefined && !port.v4Registry(r.templateId)) {
             return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_DANGLING_V4_ROUTE, `route '${r.when}' targets v4 templateId '${r.templateId}', but no descriptor for it is present`));
@@ -109,47 +100,93 @@ function validateRoutes(routes, port) {
     }
     return (0, neverthrow_1.ok)(undefined);
 }
-/** Walk Q1 with prefill support and back history for prompted dimensions. */
-async function walkWithPrefill(selector, prefilled, interactive, port) {
-    const declared = selector.questions.map((q) => q.name);
-    let answers = {};
-    const history = [];
-    let index = 0;
-    while (index < selector.questions.length) {
-        const q = selector.questions[index];
-        if (q.condition !== undefined) {
-            const gate = (0, evaluateExpression_1.evaluateExpression)(q.condition, buildScope(declared, answers), exprPort(port));
+function selectorQuestions(selector) {
+    return selector.questions.map((question) => ({
+        name: question.name,
+        type: "singleSelect",
+        condition: question.condition,
+    }));
+}
+function selectorOptionsSchema(selector) {
+    const properties = {};
+    for (const question of selector.questions) {
+        properties[question.name] = {};
+    }
+    return { properties };
+}
+function q1PromptUi(interactive, port) {
+    return {
+        async ask(question, _options, step = 1) {
+            if (!interactive) {
+                return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_MISSING_DIMENSION, `required dimension '${question.name}' was not provided (non-interactive)`));
+            }
+            const outcome = await port.prompt({ name: question.name, condition: question.condition }, step);
+            if (outcome.kind === "back" && step <= 1) {
+                return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_WALK_CANCELLED, "the create selector was cancelled"));
+            }
+            return (0, neverthrow_1.ok)(outcome);
+        },
+        askMulti() {
+            return Promise.resolve((0, neverthrow_1.err)(new teamsfx_api_1.SystemError({
+                source: SOURCE,
+                name: "BuildTargetMultiSelectUnsupported",
+                message: "selector dimensions do not support multi-select questions",
+            })));
+        },
+    };
+}
+function buildCollectPort(interactive, port) {
+    return {
+        ui: q1PromptUi(interactive, port),
+        optionsProvider: () => undefined,
+        validator: () => undefined,
+        evaluate: (node, scope) => (0, evaluateExpression_1.evaluateExpression)(node, scope, exprPort(port)),
+    };
+}
+function scalarAnswers(selector, answers, port) {
+    const normalized = {};
+    const declared = selector.questions.map((question) => question.name);
+    for (const question of selector.questions) {
+        if (question.condition !== undefined) {
+            const gate = (0, evaluateExpression_1.evaluateExpression)(question.condition, buildScope(declared, normalized), exprPort(port));
             if (gate.isErr()) {
                 return (0, neverthrow_1.err)(gate.error);
             }
             if (gate.value !== true) {
-                index++;
                 continue;
             }
         }
-        if (prefilled[q.name] !== undefined) {
-            answers[q.name] = prefilled[q.name];
-            index++;
+        const value = answers[question.name];
+        if (value === undefined) {
             continue;
         }
-        if (!interactive) {
-            return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_MISSING_DIMENSION, `required dimension '${q.name}' was not provided (non-interactive)`));
+        if (typeof value !== "string") {
+            return (0, neverthrow_1.err)(new teamsfx_api_1.SystemError({
+                source: SOURCE,
+                name: "BuildTargetNonScalarAnswer",
+                message: `selector dimension '${question.name}' resolved to a non-scalar answer`,
+            }));
         }
-        const outcome = await port.prompt(q, history.length + 1);
-        if (outcome.kind === "back") {
-            const restore = history.pop();
-            if (restore === undefined) {
-                return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_WALK_CANCELLED, "the create selector was cancelled"));
-            }
-            answers = restore.snapshot;
-            index = restore.index;
-            continue;
-        }
-        history.push({ index, snapshot: { ...answers } });
-        answers[q.name] = outcome.value;
-        index++;
+        normalized[question.name] = value;
+    }
+    return (0, neverthrow_1.ok)(normalized);
+}
+/** Walk Q1 through the shared collect-inputs engine with selector-specific prompt wiring. */
+async function collectSelectorAnswers(selector, prefilled, interactive, port, resume) {
+    const collected = await (0, collectInputs_1.walkInputs)(selectorQuestions(selector), selectorOptionsSchema(selector), prefilled, buildCollectPort(interactive, port), { resume });
+    if (collected.isErr()) {
+        return (0, neverthrow_1.err)(collected.error);
     }
-    return (0, neverthrow_1.ok)(answers);
+    const outcome = collected.value;
+    // `backable` is off for Q1, so a back past the first prompt errors in the prompt face (WCS-17)
+    // rather than returning a top-level back; the `done` branch is the live path.
+    return outcome.kind === "done"
+        ? scalarAnswers(selector, outcome.answers, port).map((answers) => ({
+            answers,
+            history: outcome.history,
+            promptCount: outcome.promptCount,
+        }))
+        : (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_WALK_CANCELLED, "the create selector was cancelled"));
 }
 /** Match the first route whose `when` predicate is true against the collected answers. */
 function matchRoute(selector, answers, port) {
@@ -166,22 +203,13 @@ function matchRoute(selector, answers, port) {
     return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_NO_MATCHING_ROUTE, "no selector route matched the resolved answers (no silent fallback)"));
 }
 /** Dispatch a matched route to its engine-specific id. */
-function dispatchRoute(r, port) {
+function dispatchRoute(r) {
     switch (r.engine) {
         case "v4":
-        case "v3":
             if (r.templateId === undefined) {
                 return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_MALFORMED_ROUTE, `route '${r.when}': missing 'templateId'`));
             }
             return (0, neverthrow_1.ok)({ templateId: r.templateId, engine: r.engine });
-        case "v3-core-method":
-            if (r.coreMethod === undefined) {
-                return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_MALFORMED_ROUTE, `route '${r.when}': missing 'coreMethod'`));
-            }
-            if (!port.v3CoreMethodRegistry(r.coreMethod)) {
-                return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_UNKNOWN_TEMPLATE, `core method '${r.coreMethod}' is not in the v3 core-method allow-list`));
-            }
-            return (0, neverthrow_1.ok)({ templateId: r.coreMethod, engine: r.engine });
         case "surface-action":
             if (r.action === undefined) {
                 return (0, neverthrow_1.err)(userError(exports.BUILD_TARGET_MALFORMED_ROUTE, `route '${r.when}': missing 'action'`));
@@ -190,26 +218,26 @@ function dispatchRoute(r, port) {
     }
 }
 /** Resolve a create/modify selector walk into a dispatched `BuildTarget`. */
-async function resolveBuildTarget(selector, prefilled, interactive, port) {
+async function resolveBuildTarget(selector, prefilled, interactive, port, options = {}) {
     // Validate the whole routing table before any route match.
     const routesOk = validateRoutes(selector.routes, port);
     if (routesOk.isErr()) {
         return (0, neverthrow_1.err)(routesOk.error);
     }
     // One prefill-aware walk covers interactive and non-interactive resolution.
-    const walked = await walkWithPrefill(selector, prefilled, interactive, port);
+    const walked = await collectSelectorAnswers(selector, prefilled, interactive, port, options.resume);
     if (walked.isErr()) {
         return (0, neverthrow_1.err)(walked.error);
     }
-    const answers = walked.value;
+    const { answers, history, promptCount } = walked.value;
     const matched = matchRoute(selector, answers, port);
     if (matched.isErr()) {
         return (0, neverthrow_1.err)(matched.error);
     }
-    const dispatched = dispatchRoute(matched.value, port);
+    const dispatched = dispatchRoute(matched.value);
     if (dispatched.isErr()) {
         return (0, neverthrow_1.err)(dispatched.error);
     }
-    return (0, neverthrow_1.ok)({ ...dispatched.value, answers });
+    return (0, neverthrow_1.ok)({ ...dispatched.value, answers, history, promptCount });
 }
 //# sourceMappingURL=resolveBuildTarget.js.map