@rse/ase 0.9.55 → 0.9.56

package/dst/ase-setup.js

@@ -808,9 +808,11 @@ export default class SetupCommand {
         /*  default for --dev derived from ASE_SETUP_DEV environment variable  */
         const envDev = process.env.ASE_SETUP_DEV ?? "";
         const devDflt = envDev !== "" && envDev !== "0" && envDev.toLowerCase() !== "false";
-        /*  default for --tool derived from ASE_TOOL environment variable  */
+        /*  default for --tool derived from ASE_TOOL environment variable
+            (validated lazily by "parseTool" in each action, so an invalid
+            value cannot break unrelated "ase" commands at startup)  */
         const envTool = process.env.ASE_TOOL ?? "";
-        const toolDflt = envTool !== "" ? this.parseTool(envTool) : "claude";
+        const toolDflt = envTool !== "" ? envTool : "claude";
         /*  register CLI top-level command "ase setup"  */
         const setupCmd = program
             .command("setup")

package/dst/ase-statusline.js

@@ -388,25 +388,23 @@ export default class StatuslineCommand {
                 /*  ==== RATE LIMITS ====  */
                 S: () => {
                     const pct5h = data.rate_limits?.five_hour?.used_percentage;
-                    if (pct5h !== undefined)
-                        emit(`${prefix("⏲", "session-usage")}${c.bold(`${pct5h.toFixed(1)}%`)}`);
+                    const s = pct5h !== undefined ? `${pct5h.toFixed(1)}%` : "-";
+                    emit(`${prefix("⏲", "5h-usage")}${c.bold(s)}`);
                 },
                 D: () => {
                     const until5h = data.rate_limits?.five_hour?.resets_at;
                     const s = formatTimeUntil(until5h);
-                    if (s !== "")
-                        emit(`${prefix("⏱", "session-resets")}${c.bold(s)}`);
+                    emit(`${prefix("⏱", "5h-resets")}${c.bold(s !== "" ? s : "-")}`);
                 },
                 W: () => {
                     const pctWk = data.rate_limits?.seven_day?.used_percentage;
-                    if (pctWk !== undefined)
-                        emit(`${prefix("⏲", "weekly-usage")}${c.bold(`${pctWk.toFixed(1)}%`)}`);
+                    const s = pctWk !== undefined ? `${pctWk.toFixed(1)}%` : "-";
+                    emit(`${prefix("⏲", "7d-usage")}${c.bold(s)}`);
                 },
                 Q: () => {
                     const untilWk = data.rate_limits?.seven_day?.resets_at;
                     const s = formatTimeUntil(untilWk);
-                    if (s !== "")
-                        emit(`${prefix("⏱", "weekly-resets")}${c.bold(s)}`);
+                    emit(`${prefix("⏱", "7d-resets")}${c.bold(s !== "" ? s : "-")}`);
                 },
                 /*  ==== COSTS ====  */
                 H: () => {

package/dst/ase-task.js

@@ -529,15 +529,33 @@ export class TaskMCP {
             title: "ASE task load",
             description: "Load a previously persisted task by `id`. " +
                 "Returns the task as `text`, normalized into the current Markdown frontmatter shape; " +
-                "returns an empty string if no task exists for the `id`.",
+                "returns an empty string if no task exists for the `id`. " +
+                "The `variant` argument selects the returned form of the plan: " +
+                "`source` (the default) is the *authoring* form and the *only* form which may be " +
+                "edited and passed back into `ase_task_save`; " +
+                "`render` is the *rendering-prepared* form, which is for *display only* and " +
+                "MUST NOT be persisted; " +
+                "`both` returns the source form enclosed in `<task-plan-source>` delimiter lines, " +
+                "followed by the render form enclosed in `<task-plan-render>` delimiter lines.",
             inputSchema: {
                 id: z.string()
-                    .describe("task identifier (allowed characters: A-Z, a-z, 0-9, '_', '-')")
+                    .describe("task identifier (allowed characters: A-Z, a-z, 0-9, '_', '-')"),
+                variant: z.enum(["source", "render", "both"]).optional()
+                    .describe("returned form of the plan: `source` (authoring form, the default), " +
+                    "`render` (rendering-prepared form, display only), or `both` " +
+                    "(both forms, each enclosed in its delimiter lines)")
             }
         }, async (args) => {
             try {
-                const raw = Task.load(this.log, args.id);
-                const text = Markdown.prepare(raw);
+                const source = Task.load(this.log, args.id);
+                const variant = args.variant ?? "source";
+                let text = source;
+                if (source !== "" && variant === "render")
+                    text = Markdown.prepare(source);
+                else if (source !== "" && variant === "both")
+                    text =
+                        `<task-plan-source>\n${source}\n</task-plan-source>\n\n` +
+                            `<task-plan-render>\n${Markdown.prepare(source)}\n</task-plan-render>\n`;
                 return {
                     content: [{ type: "text", text }]
                 };
@@ -550,21 +568,28 @@ export class TaskMCP {
         mcp.registerTool("ase_task_save", {
             title: "ASE task save",
             description: "Persist a task as `text` under `id`. " +
-                "Overwrites any existing task for the same `id`. " +
-                "Returns the persisted task as `text`, prepared for improved rendering.",
+                "The `text` MUST be the *authoring* form of the plan (as returned by the " +
+                "`source` variant of `ase_task_load`) and hence MUST NOT carry any rendering " +
+                "artifacts. Overwrites any existing task for the same `id`. " +
+                "Returns a status `text` by default, or, if `render` is `true`, the " +
+                "*rendering-prepared* form of the just-saved plan, for display purposes only.",
             inputSchema: {
                 id: z.string()
                     .describe("task identifier (allowed characters: A-Z, a-z, 0-9, '_', '-')"),
                 text: z.string()
-                    .describe("text content of the task")
+                    .describe("text content of the task, in its authoring form"),
+                render: z.boolean().optional()
+                    .describe("if true, return the rendering-prepared form of the just-saved " +
+                    "plan instead of a status message (default: false)")
             }
         }, async (args) => {
             try {
                 Task.save(this.log, args.id, args.text);
-                /*  return the prepared content, so a caller reusing the
-                    just-saved plan instead of re-loading it still receives
-                    the rendering-prepared variant  */
-                const text = Markdown.prepare(args.text);
+                /*  return the rendering-prepared content on demand, so a caller
+                    displaying the just-saved plan does not have to re-load it  */
+                const text = (args.render ?? false) ?
+                    Markdown.prepare(args.text) :
+                    `OK: saved task "${args.id}"`;
                 return {
                     content: [{ type: "text", text }]
                 };

package/package.json

@@ -6,7 +6,7 @@
     "homepage":                             "https://ase.tools",
     "repository":                           { "url": "git+https://github.com/rse/ase.git", "type": "git" },
     "bugs":                                 { "url": "https://github.com/rse/ase/issues" },
-    "version":                              "0.9.55",
+    "version":                              "0.9.56",
     "license":                              "Apache-2.0",
     "author": {
         "name":                             "Dr. Ralf S. Engelschall",
@@ -18,12 +18,12 @@
     "devDependencies": {
         "eslint":                           "9.39.4",
         "@eslint/js":                       "9.39.4",
-        "@typescript-eslint/parser":        "8.65.0",
-        "@typescript-eslint/eslint-plugin": "8.65.0",
+        "@typescript-eslint/parser":        "8.66.0",
+        "@typescript-eslint/eslint-plugin": "8.66.0",
         "eslint-plugin-promise":            "7.3.0",
         "eslint-plugin-import":             "2.32.0",
         "neostandard":                      "0.13.0",
-        "globals":                          "17.8.0",
+        "globals":                          "17.9.0",
         "typescript":                       "6.0.3",
 
         "@rse/stx":                         "1.1.6",
@@ -42,7 +42,7 @@
     },
     "dependencies": {
         "commander":                        "15.0.0",
-        "@dotenvx/dotenvx":                 "2.19.1",
+        "@dotenvx/dotenvx":                 "2.19.2",
         "yaml":                             "2.9.0",
         "valibot":                          "1.4.2",
         "execa":                            "10.0.1",

package/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
     "name":        "ase",
-    "version":     "0.9.55",
+    "version":     "0.9.56",
     "description": "Agentic Software Engineering (ASE)",
     "keywords":    [ "agentic", "software", "engineering" ],
     "homepage":    "https://ase.tools",

package/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
     "name":        "ase",
-    "version":     "0.9.55",
+    "version":     "0.9.56",
     "description": "Agentic Software Engineering (ASE)",
     "keywords":    [ "agentic", "software", "engineering" ],
     "homepage":    "https://ase.tools",

package/plugin/.github/plugin/plugin.json

@@ -1,6 +1,6 @@
 {
     "name":        "ase",
-    "version":     "0.9.55",
+    "version":     "0.9.56",
     "description": "Agentic Software Engineering (ASE)",
     "keywords":    [ "agentic", "software", "engineering" ],
     "homepage":    "https://ase.tools",

package/plugin/agents/ase-code-analyze.md

@@ -63,7 +63,7 @@ Workflow
         -   incorrect short-circuit evaluation or operator precedence
         -   logical vs. bitwise operator confusion
         -   negation mistakes in compound predicates
-        -   wrong comparison operator (`==` instead of `===`, `<` vs. `<=`, etc)
+        -   wrong comparison operator (`==` instead of `===`, `<` vs. `<=`, etc.)
         -   inverted condition or swapped if/else branches
         -   dead or duplicated conditional branches
         -   fall-through where a break or return was intended

package/plugin/agents/ase-code-lint.md

@@ -65,10 +65,10 @@ Workflow
         identifiers, string literals and comments.
 
         Especially, for comments ensure English language only and
-        prefer short very brief one-line descriptions.
+        prefer short, very brief one-line descriptions.
 
     -   **A05 - COMPLEXITY**:
-        Check for extremely long functions, and deeply nested code
+        Check for extremely long functions and deeply nested code
         constructs.
 
         Especially, for functions prefer fewer than 100 lines, and for
@@ -185,8 +185,8 @@ Workflow
     -   **A15 - PERFORMANCE**:
         Check for bad performance and inefficiency issues.
 
-        Especially, check for code constructs with a high (i.e., not
-        constant/O(1), or linear/O(n) complexity) in its execution time
+        Especially, check for code constructs with a high complexity (i.e., not
+        constant/O(1), or linear/O(n)) in their execution time
         and/or memory consumption.
 
     -   **A16 - SECURITY**:

package/plugin/agents/ase-meta-chat.md

@@ -56,5 +56,5 @@ tools:
 4.  Now call the MCP tool `query(prompt: <query/>)` from the MCP server
     <server/> and then return its result `text` *verbatim* and *without
     any modifications* as the last message. Especially, do *NOT* add or
-    remove any text to the MCP server response on your own and do not
+    remove any text to or from the MCP server response on your own and do not
     interpret the result in any way.

package/plugin/agents/ase-meta-proximity.md

@@ -102,7 +102,7 @@ store those facts in the placeholder named `<arg2/>`.
         <child-4/>.
 
         <expand name="gather-facts"
-            arg1="the CHILDREN topics (narrower topics that are specializations) of the following topic: <topic/>"
+            arg1="the CHILD topics (narrower topics that are specializations) of the following topic: <topic/>"
             arg2="facts-children"></expand>
 
         Ground the determination of the canonical names of the most

package/plugin/meta/ase-common-code.md

@@ -4,7 +4,7 @@ Code Skill Common Steps
 
 <define name="code-tenets">
 
-You *MUST* internalize and strictly honor the **GENERIC TENETS**, and
+You *MUST* internalize and strictly honor the **GENERIC TENETS** and
 the **<arg1/> TENETS** of the **ASE Tenets** in the following creation
 and updating of code. Do not output anything.
 
@@ -32,3 +32,166 @@ Then honor the tenet sets of <task-kind/>:
 <expand name="code-tenets" arg1="<task-kind/>"></expand>
 
 </define>
+
+<define name="code-approaches">
+
+You *MUST* perform the following sub-steps *internally* and *without
+any output* until and including the recommendation decision. Only
+sub-steps 4-7 below are allowed to produce output; sub-steps 4-6 only if
+<getopt-option-auto/> is equal `false` *and* <ase-project-boxing/>
+is *not* equal `black`.
+
+If <getopt-option-auto/> is equal `true` or <ase-project-boxing/> is
+equal `black`, *skip* the reporting sub-steps 4-6 entirely (they
+perform no output at all) to speed up processing.
+
+1.  *Propose* a corresponding *<arg1/> approach*, optionally including
+    some *alternative* <arg1/> approaches. Do *not* output anything
+    in this sub-step.
+
+2.  *Reflect* on and *critique* the proposed approaches by deriving,
+    per approach, a small set of concrete *pros* and *cons*. Do
+    *not* output anything in this sub-step.
+
+3.  Based on the reflection, *decide* which approach to recommend
+    and annotate it with an <annotation/> of
+    ` ⚝ **RECOMMENDATION** ⚝`. All other approaches receive an
+    empty <annotation/>. Do *not* output anything in this sub-step.
+
+4.  Indicate start of reporting by showing the following <template/>:
+
+    <template>
+    <ase-tpl-head title="APPROACHES"/>
+    </template>
+
+5.  Now report each approach with the following <template/>,
+    inlining its pros/cons derived in sub-step 2, and do not output
+    anything else in this step:
+
+    <template>
+    ●   **APPROACH A<n/>**<annotation/>: **<summary/>**
+    ○   [...]
+    ⊕   *PRO*: [...]
+    ⊖   *CON*: [...]
+    </template>
+
+    Hints:
+
+    -   Give a short one-sentence <summary/> of the <arg1/> approach
+        plus *precise* and *ultra brief and concise* <arg1/>
+        information. Try to keep the number of bullet points
+        (`○ [...]`) in the range of 1-4.
+
+6.  Indicate end of reporting by showing the following <template/>:
+
+    <template>
+    <ase-tpl-foot title="APPROACHES"/>
+    </template>
+
+7.  <if condition="<getopt-option-auto/> is not equal `true` and <ase-project-boxing/> is not equal `black`">
+
+    In the following, you *MUST* *NOT* use your built-in
+    <user-dialog-tool/> tool! Instead, you *MUST* just show a
+    custom dialog according to the expanded `custom-dialog`
+    definition. You *MUST* closely follow this definition.
+
+    Let the user choose the preferred approach A<n/> by raising
+    a question with the following custom dialog, where per
+    approach A<n/>, you determine an ultra brief summary
+    <short-summary/> and then use the answer option `A<n/>:
+    ⚝ **RECOMMENDATION** ⚝ - <short-summary/>` for your
+    recommended approach plus zero or more answer options `A<n/>:
+    <short-summary/>` for all other approaches:
+
+    <expand name="custom-dialog" arg1="--no-other">
+        Select Approach: Select your preferred <arg2/> approach to follow?
+        A<n/>: <short-summary/>
+        [...]
+    </expand>
+
+    </if>
+    <else>
+
+    Set <n/> to the number of the <arg1/> approach A<n/> you recommend.
+    Output a hint with the following <template/>:
+
+    <template>
+    ⧉ **ASE**: ◉ task: **<ase-task-id/>**, ▶ status: **auto-chosen approach A<n/>**
+    </template>
+
+    </else>
+
+</define>
+
+<define name="code-next-dispatch">
+
+Treat <getopt-option-next/> as a comma-separated chronological
+list of pre-selected next-step tokens. *Peek* the *first* token
+as <head/> (or `none` if the list is `none`/empty).
+Set <args>--int-reuse-task</args>.
+
+1.  <if condition="<head/> is equal `DONE`">
+    Consume the head: set <getopt-option-next/> to the remaining
+    tokens (joined back with `,`, or `none` if empty). `DONE`
+    means the freshly composed plan is finalized as-is, so do
+    *not* hand off to `ase-task-edit`. Only output the following
+    <template/> and then *STOP*. Do *not* implement the plan.
+
+    <template>
+    ⧉ **ASE**: ◉ task: **<ase-task-id/>**, ✪ plan: **<words/>** words, ▶ status: **plan finalized -- done**
+    </template>
+    </if>
+
+2.  <elseif condition="<head/> is equal `IMPLEMENT`">
+    Consume the head: set <getopt-option-next/> to the remaining
+    tokens (joined back with `,`, or `none` if empty).
+    <if condition="<getopt-option-next/> is not equal `none`">
+        Set <args><args/> --next <getopt-option-next/></args>
+    </if>
+    Call the tool `Skill(skill: "ase:ase-task-implement", args: "<args/>")`
+    to *implement* the freshly composed plan, bypassing `ase-task-edit`.
+    </elseif>
+
+3.  <elseif condition="<head/> is equal `PREFLIGHT`">
+    Consume the head: set <getopt-option-next/> to the remaining
+    tokens (joined back with `,`, or `none` if empty).
+    <if condition="<getopt-option-next/> is not equal `none`">
+        Set <args><args/> --next <getopt-option-next/></args>
+    </if>
+    Call the tool `Skill(skill: "ase:ase-task-preflight", args: "<args/>")`
+    to *preflight* the freshly composed plan, bypassing `ase-task-edit`.
+    </elseif>
+
+4.  <elseif condition="<head/> is equal `GRILL`">
+    Consume the head: set <getopt-option-next/> to the remaining
+    tokens (joined back with `,`, or `none` if empty). `GRILL`
+    is this skill's own dispatch token, *not* part of
+    `ase-task-grill`'s `--next` vocabulary, so it must be
+    stripped here rather than forwarded. All remaining tokens are
+    `ase-task-grill`'s own vocabulary and are forwarded verbatim.
+    <if condition="<getopt-option-next/> is not equal `none`">
+        Set <args><args/> --next <getopt-option-next/></args>
+    </if>
+    Call the tool `Skill(skill: "ase:ase-task-grill", args: "<args/>")`
+    to *grill* the freshly composed plan, bypassing `ase-task-edit`.
+    </elseif>
+
+5.  <else>
+    Hand off to `ase-task-edit`.
+    <if condition="<head/> is equal `EDIT`">
+        Consume the head: set <getopt-option-next/> to the remaining
+        tokens (joined back with `,`, or `none` if empty). `EDIT`
+        is this skill's own dispatch token, *not* part of
+        `ase-task-edit`'s `--next` vocabulary, so it must be
+        stripped here rather than forwarded.
+    </if>
+    All remaining tokens are `ase-task-edit`'s own vocabulary
+    and are forwarded verbatim, so `ase-task-edit` consumes its
+    own head itself.
+    <if condition="<getopt-option-next/> is not equal `none`">
+        Set <args><args/> --next <getopt-option-next/></args>
+    </if>
+    Then call the tool `Skill(skill: "ase:ase-task-edit", args: "<args/>")`.
+    </else>
+
+</define>

package/plugin/meta/ase-common-task.md

@@ -62,29 +62,30 @@ Task Skill Common Steps
 
 <if condition="
     <getopt-option-int-reuse-task/> is equal `true`
-    *and* a `ase_task_save(id: '<ase-task-id/>', ...)` tool call
+    *and* an `ase_task_save(id: '<ase-task-id/>', ...)` tool call
     exists earlier in the current session
 ">
-    Set <text/> to the `text` *output* field of the most recent
+    Set <text/> to the `text` *argument* of the most recent
     `ase_task_save(id: '<ase-task-id/>', ...)` tool call -- this is
-    the rendering-prepared plan content and *MUST NOT* be confused
-    with the `text` *argument* passed into that call -- *without*
+    the *authoring form* of the plan and *MUST NOT* be confused
+    with the `text` *output* field of that call -- *without*
     calling `ase_task_load` again. Set <status>plan
     reused</status>. Do not output anything.
 </if>
 <else>
     Call the `ase_task_load(id: "<ase-task-id/>")` tool of the
-    `ase` MCP server to load the current task plan content and
-    set <text/> to the `text` output field of this `ase_task_load`
-    tool call. Do not output anything related to this MCP tool
-    call. Set <status>plan loaded</status>.
+    `ase` MCP server to load the current task plan content in its
+    *authoring form* -- the `variant` argument defaults to `source`
+    -- and set <text/> to the `text` output field of this
+    `ase_task_load` tool call. Do not output anything related to
+    this MCP tool call. Set <status>plan loaded</status>.
 </else>
 
 -   If <text/> starts with `ERROR:` or `WARNING:`:
     Set <task-content></task-content> (set task content to empty).
     Set <words/> to "0".
 
--   If <text/> starts NOT with `ERROR:` and NOT with `WARNING:`:
+-   If <text/> does NOT start with `ERROR:` and NOT with `WARNING:`:
     Set <task-content><text/></task-content> (set task content to text).
     Calculate the number of words <words/> of <task-content/>.
 
@@ -101,7 +102,7 @@ Only output the following <template/>:
 Update <timestamp-modified/> with the current time in ISO-style
 format, which has to be determined by calling the
 `ase_timestamp(format: "yyyy-LL-dd HH:mm")` tool of the `ase`
-MCP server and use the `text` field of its response. If
+MCP server and using the `text` field of its response. If
 <timestamp-created/> is still unset (because the plan content
 had no `Created:` frontmatter key), set
 <timestamp-created><timestamp-modified/></timestamp-created>
@@ -113,8 +114,8 @@ the number of words <words/> of <task-content/>.
 
 Call the `ase_task_save(id: "<ase-task-id/>", text:
 "<task-content/>")` tool of the `ase` MCP server to save the task
-plan content. Do not output anything related to this MCP call
-except the following <template/>:
+plan content in its *authoring form*. Do not output anything
+related to this MCP call except the following <template/>:
 
 <template>
 ⧉ **ASE**: ◉ task: **<ase-task-id/>**, ✪ plan: **<words/>** words, ▶ status: **<arg1/>**
@@ -143,7 +144,7 @@ except the following <template/>:
         ⧉ **ASE**: ☻ skill: **<arg1/>**, ▶ ERROR: invalid `--next` token: **<head/>**
         </template>
 
--   If <getopt-option-next/> is equal to `none`:
+-   Else, i.e. <getopt-option-next/> was *originally* equal to `none`:
 
     In the following, you *MUST* *NOT* use your built-in
     <user-dialog-tool/> tool! Instead, you *MUST* just show a

package/plugin/meta/ase-constitution.md

@@ -13,7 +13,7 @@ which boosts you to an expert-level Software Engineering AI agent.
 - Do *not* use braces around single-statement blocks in "if" and "while" constructs unless the language requires them.
 - Do *not* insist on early "return" in "if" blocks, if an "else" block exists.
 - Do *not* remove any whitespace in the code formatting -- keep whitespace aligned with code base.
-- Do *not* produce any trailing white-spaces on any lines.
+- Do *not* produce any trailing whitespace on any lines.
 - Do *not* guess missing tool call parameters or fill them with invented placeholder values.
 
 ## Commandments
@@ -24,7 +24,7 @@ which boosts you to an expert-level Software Engineering AI agent.
 - Assume your *internal knowledge of dependencies* (libraries, frameworks, tools, and their implementations)
   is *outdated*; always verify the current API, version, and usage pattern against the local sources
   or the web before writing any code against them.
-- Before proposing any code changes, explain *WHAT* the proposed changes do and *WHY* it is necessary.
+- Before proposing any code changes, explain *WHAT* the proposed changes do and *WHY* they are necessary.
 - Use *concise* and *type-safe code* only.
 - Use *precise* and *surgical code changes* only.
 - Be very *pedantic* on code style.
@@ -36,7 +36,7 @@ which boosts you to an expert-level Software Engineering AI agent.
 - Always use *parentheses around arrow function parameters*, even for a single parameter.
 - Make a line break before the keywords "else", "catch", and "finally".
 - Try to *vertically align similar operators* on consecutive, similar lines.
-- Place spaces after opening and before closing angle brackets
+- Place spaces after opening and before closing square brackets
   (except for array access and array types) and braces (except for regular expression ranges).
 - Use *double-quotes* (`"[...]"`) instead of single-quotes (`'[...]'`) for all strings.
 - Use K&R coding style with *opening braces* at the end of lines and *closing braces* at the beginning of lines.

package/plugin/meta/ase-control.md

@@ -6,9 +6,9 @@ Control Flow Constructs
     <define name="<define-name/>"><define-body/></define>:
 
     This specifies a *reusable definition* named <define-name/> and
-    an <define-body/> which can contain arbitrary information with
+    a <define-body/> which can contain arbitrary information with
     optional `<args/>` (or alternatively, individual `<arg1/>`,
-    `<arg2/>`, etc) and optional `<content/>` references from
+    `<arg2/>`, etc.) and optional `<content/>` references from
     subsequent <expand/> calls.
     This construct is expanded into nothing.
     Do not output anything.
@@ -20,7 +20,7 @@ Control Flow Constructs
     construct is expanded to the <define-body/> of <define/> with
     `<args/>` substituted with `<expand-arg1/> <expand-arg2/> [...]`,
     `<arg1/>` substituted with <expand-arg1/>, `<arg2/>` substituted
-    with <expand-arg2/>, etc, and `<content/>` substituted with
+    with <expand-arg2/>, etc., and `<content/>` substituted with
     <expand-content/>. Do not output anything else.
 
 -   *IMPORTANT*: You *MUST* honor the following control flow construct:
@@ -47,7 +47,7 @@ Control Flow Constructs
     <if condition="<if-condition/>"><if-body/></if>:
 
     This specifies a simple condition which is expanded to <if-body/>
-    if <if-condition/> is met, or to empty string if <if-condition/> is
+    if <if-condition/> is met, or to the empty string if <if-condition/> is
     *not* met. It can be optionally followed by one or more <elseif/>
     constructs and/or one final <else/> construct. Do not output anything else.
 
@@ -112,11 +112,11 @@ Control Flow Constructs
     anything else.
 
 -   *IMPORTANT*: You *MUST* honor the following control flow construct:
-    <agent-consolidation [group=<agent-group/>]/>
+    <agent-consolidation [group=<agent-group/>]/>:
 
     This specifies the merging of all the Git WorkTrees created by the
-    <agent/> calls with either are identified with the unique group
-    <agent-group/> or all <agent/> calls in the last <parallel/> section
+    <agent/> calls which either are identified with the unique group
+    <agent-group/> or occur in the last <parallel/> section
     of the context. After merging a single Git WorkTree, remove the Git
     WorkTree.
 

package/plugin/meta/ase-dialog.md

@@ -63,7 +63,7 @@ following procedure:
 
             <text>
             <text/>
-            <ase-tpl-boxline><label-key/>  ▶  <label-text/><label-pad/> <description/></ase-tpl-boxline>
+            <label-key/>  ▶  <label-text/><label-pad/> <description/>
             </text>
 
             <if condition="<keys/> is empty">
@@ -82,7 +82,7 @@ following procedure:
         </else>
 
         <if condition="<opts/> contains `--other` and does *not* contain `--no-other`">
-            Set <hint>Please choose *one* option by typing <keys/>, or other free-text instruction.</hint>.
+            Set <hint>Please choose *one* option by typing <keys/>, or any other free-text instruction.</hint>.
         </if>
         <else>
             Set <hint>Please choose *one* option by typing <keys/>.</hint>.
@@ -93,7 +93,7 @@ following procedure:
         <text>
         <ase-tpl-boxed title="DIALOG" subtitle="<question-label/>">
 
-        <ase-tpl-boxline>**<question-description/>**</ase-tpl-boxline>
+        **<question-description/>**
 
         <text/>
 
@@ -125,7 +125,8 @@ following procedure:
             otherwise indicates that the user doesn't want to proceed,
             or the user declined to answer the question, or that
             the dialog was cancelled, rejected or skipped, set
-            <result>CANCEL</result>.
+            <result>CANCEL</result> and *SKIP* all remaining steps
+            2.3.3 - 2.3.4 of this dispatch.
 
         3.  Otherwise, determine the selected <label/>
             by mapping the <result/> (usually containing one of the