skillscript-runtime 0.15.7 → 0.16.1

package/dist/parser.js

@@ -2,22 +2,21 @@
 // no resolution against external state. Semantic analysis (variable resolution,
 // data-skill inlining, topo-sort) lives in compile.ts.
 /**
- * v0.7.0 — runtime-intrinsic function-call names. Closed set of ops the
- * language implements directly (no MCP dispatch). Function-call grammar:
+ * Runtime-intrinsic function-call names. Closed set of ops the language
+ * implements directly (no MCP dispatch). Function-call grammar:
  * `verb(kwarg=value, ...) [-> BINDING]`.
  *
  * Anything else with function-call shape is rejected by parser with a
  * remediation pointing at `$ tool args -> R` for MCP dispatch.
  */
 export const RUNTIME_INTRINSIC_FN_NAMES = [
-    "emit", // → ! (output to skill consumer)
-    "ask", // → ?? (prompt user)
-    "inline", // → & (compile-time skill composition)
-    "execute_skill", // → $ execute_skill (runtime skill invocation)
-    "shell", // → @ (local subprocess)
+    "emit", // output to skill consumer
+    "inline", // compile-time skill composition
+    "execute_skill", // runtime skill invocation (dispatches via $ execute_skill)
+    "shell", // local subprocess
     "file_read", // read file contents at runtime
     "file_write", // write file contents at runtime
-    "notify", // v0.8.0 — mid-skill synchronous agent alert via AgentConnector(s)
+    "notify", // mid-skill synchronous agent alert via AgentConnector(s)
 ];
 /**
  * Case-insensitive accept, canonical-form return. The `allowed` list defines
@@ -37,8 +36,6 @@ function normalizeEnumValue(raw, allowed) {
 const REQUIRES_LINE = /^(user-var|system-var):([A-Za-z0-9_-]+)\s*(?:→|->)\s*([A-Za-z_][\w-]*)\s*(?:\(\s*fallback\s*:\s*(.+?)\s*\)\s*)?$/;
 /** Capability token: `connector_type.feature_flag`. Matches one space-separated token of a capability `# Requires:` line. */
 const CAPABILITY_TOKEN = /^[a-z_][a-z0-9_]*\.[a-z_][a-z0-9_]*$/;
-/** `&` op: `& skill-name [arg=value ...] [-> VARNAME]`. Skill names follow the same charset as filesystem-safe identifiers (alphanumeric, hyphen, underscore). */
-const AMPERSAND_OP_REGEX = /^&\s+([A-Za-z0-9][\w-]*)\s*(.*?)(?:\s*->\s*([A-Za-z_]\w*))?(?:\s+\(fallback\s*:\s*(.+?)\))?\s*$/s;
 // v0.7.2 — `(.*)` widened to `([\s\S]*)` so multi-line triple-quote
 // (`"""..."""`) values fold into a single $set value capture. Without the
 // dotall-equivalent, the `.` excludes newlines and the regex stops at the
@@ -75,24 +72,9 @@ function extractApprovedKwarg(body) {
         return undefined;
     return m[1] ?? m[2] ?? "";
 }
-// v0.9.2 — P0.5 detect missing-space dispatch: `$<word> args` where `<word>`
-// isn't `set`/`append` (the only legitimate no-space `$`-prefix verbs).
+// P0.5 detect missing-space dispatch: `$<word> args` where `<word>` isn't
+// `set`/`append` (the only legitimate no-space `$`-prefix verbs).
 const NO_SPACE_DISPATCH_RE = /^\$(?!set\b|append\b)\w+\s/;
-/**
- * `>` and `~` ops accept optional trailing `(fallback: <value>)` per
- * language reference §9 (Error Handling, Layer 3). Fires when the op
- * throws or returns empty — runtime binds the fallback value to the
- * output var and continues without surfacing the error.
- *
- * Value is permissive (matching `# Requires:` cascade convention): bare
- * identifiers (`ip-based`), quoted strings (`"weather unavailable"`),
- * array literals (`[]`, `[a, b]`), and arbitrary text between the colon
- * and the closing paren are all accepted. Parser stores the raw form;
- * runtime applies `coerceLiteralValue` for `>` (binds array on `[...]`)
- * and the raw string for `~` (model response shape).
- */
-const RETRIEVAL_OP_REGEX = /^>\s+(.+?)\s+->\s+([A-Za-z_]\w*)(?:\s+\(fallback\s*:\s*(.+?)\))?\s*$/s;
-const LOCAL_MODEL_OP_REGEX = /^~\s+(.+?)\s+->\s+([A-Za-z_]\w*)(?:\s+\(fallback\s*:\s*(.+?)\))?\s*$/s;
 const MCP_CONNECTOR_PREFIX = /^([a-z_][a-z0-9_-]*)\.(?=[A-Za-z_])([\s\S]*)$/;
 // Narrow v1 condition grammar.
 // v0.3.4: filter chain support — each `(REF)(|filter)?` became `(REF)(|filter)*`
@@ -122,26 +104,44 @@ const COND_EQ_REF = new RegExp(`^\\s*${REF_PATTERN}\\s*(?:==|!=)\\s*${REF_PATTER
 const COND_CMP = new RegExp(`^\\s*${REF_PATTERN}\\s*(?:<=|>=|<|>)\\s*"[^"]*"\\s*$`);
 const COND_CMP_REF = new RegExp(`^\\s*${REF_PATTERN}\\s*(?:<=|>=|<|>)\\s*${REF_PATTERN}\\s*$`);
 const COND_IN = new RegExp(`^\\s*${REF_PATTERN}\\s+(?:not\\s+)?in\\s+${REF_PATTERN_NO_FILTER}\\s*$`);
+// Parser resource caps. The "parser never throws on bad input" contract
+// requires bounded recursion + length-capped regex application — without
+// these guards, adversarial input crashes the host (stack overflow via
+// `a and b and c and ...` deeply-chained AND; CPU exhaustion via
+// REF_PATTERN's nested `*` quantifiers backtracking on near-valid input).
+// Length cap is upstream of regex application (smaller risk than regex
+// refactor, which is deferred). Depth cap is downstream of the length
+// check; both must hold.
+const MAX_CONDITION_LENGTH = 4096;
+const MAX_CONDITION_DEPTH = 64;
 function validateCondition(cond) {
-    return validateCompoundCondition(cond.trim());
+    const trimmed = cond.trim();
+    if (trimmed.length > MAX_CONDITION_LENGTH)
+        return false;
+    return validateCompoundCondition(trimmed, 0);
 }
-// v0.3.2 — recursive structural decomposition matching runtime evalCondition.
+// Recursive structural decomposition matching runtime evalCondition.
 // Order: strip parens → split on outermost OR → AND → not prefix → simple shape.
-function validateCompoundCondition(cond) {
+// `depth` is incremented per recursive call and capped at MAX_CONDITION_DEPTH —
+// adversarial input like `a and b and c and ... (1000 ANDs)` would otherwise
+// blow the JS stack.
+function validateCompoundCondition(cond, depth) {
+    if (depth > MAX_CONDITION_DEPTH)
+        return false;
     const stripped = stripOuterCondParens(cond);
     const orIdx = findOuterCondToken(stripped, "or");
     if (orIdx >= 0) {
-        return validateCompoundCondition(stripped.slice(0, orIdx).trim())
-            && validateCompoundCondition(stripped.slice(orIdx + 4).trim());
+        return validateCompoundCondition(stripped.slice(0, orIdx).trim(), depth + 1)
+            && validateCompoundCondition(stripped.slice(orIdx + 4).trim(), depth + 1);
     }
     const andIdx = findOuterCondToken(stripped, "and");
     if (andIdx >= 0) {
-        return validateCompoundCondition(stripped.slice(0, andIdx).trim())
-            && validateCompoundCondition(stripped.slice(andIdx + 5).trim());
+        return validateCompoundCondition(stripped.slice(0, andIdx).trim(), depth + 1)
+            && validateCompoundCondition(stripped.slice(andIdx + 5).trim(), depth + 1);
     }
     const lead = stripped.trimStart();
     if (lead.startsWith("not "))
-        return validateCompoundCondition(lead.slice(4));
+        return validateCompoundCondition(lead.slice(4), depth + 1);
     return COND_TRUTHY.test(stripped) || COND_EQ.test(stripped) || COND_EQ_REF.test(stripped) ||
         COND_CMP.test(stripped) || COND_CMP_REF.test(stripped) || COND_IN.test(stripped);
 }
@@ -686,109 +686,6 @@ function splitMcpConnectorPrefix(body) {
         return { connector: undefined, rest: body };
     return { connector: m[1], rest: m[2] };
 }
-function parseRetrievalArgs(argsStr, targetName) {
-    const errors = [];
-    const map = {};
-    const tokens = tokenizeKeywordArgs(argsStr);
-    for (const tok of tokens) {
-        const eq = tok.indexOf("=");
-        if (eq === -1) {
-            errors.push(`Malformed \`>\` arg '${tok}' in target '${targetName}' — expected key=value`);
-            continue;
-        }
-        const key = tok.slice(0, eq).trim();
-        const rawValue = tok.slice(eq + 1);
-        map[key] = processSetValue(rawValue);
-    }
-    for (const required of ["mode", "query", "limit"]) {
-        if (!(required in map) || map[required] === "") {
-            errors.push(`\`>\` op in target '${targetName}' missing required param '${required}'`);
-        }
-    }
-    // Defer integer validation when the value contains a `$(VAR)` ref — runtime
-    // substitutes + parses after the ref resolves. Literal numerics still
-    // validate at parse time.
-    let limit = 0;
-    const rawLimit = map["limit"] ?? "";
-    if (/\$[(\{]/.test(rawLimit)) {
-        limit = rawLimit;
-    }
-    else {
-        const n = parseInt(rawLimit, 10);
-        if (!Number.isFinite(n) || n <= 0) {
-            errors.push(`\`>\` op in target '${targetName}': 'limit' must be a positive integer or a \`$(VAR)\` ref (got '${rawLimit}')`);
-        }
-        else {
-            limit = n;
-        }
-    }
-    const extra = {};
-    for (const [k, v] of Object.entries(map)) {
-        if (k === "mode" || k === "query" || k === "limit" || k === "connector")
-            continue;
-        extra[k] = v;
-    }
-    return {
-        params: {
-            mode: map["mode"] ?? "",
-            query: map["query"] ?? "",
-            limit,
-            connector: map["connector"] ?? "primary",
-            extra,
-        },
-        errors,
-    };
-}
-function parseLocalModelArgs(argsStr, targetName) {
-    const errors = [];
-    const map = {};
-    const tokens = tokenizeKeywordArgs(argsStr);
-    for (const tok of tokens) {
-        const eq = tok.indexOf("=");
-        if (eq === -1) {
-            errors.push(`Malformed \`~\` arg '${tok}' in target '${targetName}' — expected key=value`);
-            continue;
-        }
-        const key = tok.slice(0, eq).trim();
-        const rawValue = tok.slice(eq + 1);
-        map[key] = processSetValue(rawValue);
-    }
-    const recognized = new Set(["prompt", "model", "maxTokens", "timeoutSeconds"]);
-    for (const key of Object.keys(map)) {
-        if (!recognized.has(key)) {
-            errors.push(`\`~\` op in target '${targetName}': unrecognized param '${key}' — strict grammar allows prompt/model/maxTokens/timeoutSeconds only. Interpolate context into the prompt string via $(...) instead.`);
-        }
-    }
-    if (!("prompt" in map) || map["prompt"] === "") {
-        errors.push(`\`~\` op in target '${targetName}' missing required param 'prompt'`);
-    }
-    // Defer integer validation when the value contains a `$(VAR)` ref.
-    function deferInt(key) {
-        if (!(key in map))
-            return undefined;
-        const raw = map[key];
-        if (/\$[(\{]/.test(raw))
-            return raw;
-        const n = parseInt(raw, 10);
-        if (!Number.isFinite(n) || n <= 0) {
-            errors.push(`\`~\` op in target '${targetName}': '${key}' must be a positive integer or a \`$(VAR)\` ref (got '${raw}')`);
-            return undefined;
-        }
-        return n;
-    }
-    const maxTokens = deferInt("maxTokens");
-    const timeoutSeconds = deferInt("timeoutSeconds");
-    const params = {
-        prompt: map["prompt"] ?? "",
-    };
-    if ("model" in map && map["model"] !== "")
-        params.model = map["model"];
-    if (maxTokens !== undefined)
-        params.maxTokens = maxTokens;
-    if (timeoutSeconds !== undefined)
-        params.timeoutSeconds = timeoutSeconds;
-    return { params, errors };
-}
 function popToDepth(stack, targetDepth) {
     while (stack.length > 0 && stack[stack.length - 1].depth > targetDepth) {
         stack.pop();
@@ -1349,82 +1246,18 @@ export function parse(source) {
             continue;
         }
         if (stripped0.startsWith("> ")) {
-            const match = RETRIEVAL_OP_REGEX.exec(stripped0);
-            if (!match) {
-                result.parseErrors.push(`Malformed \`>\` op in target '${currentTarget.name}' — expected \`> key=value ... -> VARNAME [(fallback: "value")]\``);
-                continue;
-            }
-            const [, argsStr, outputVar, fallback] = match;
-            const parsed = parseRetrievalArgs(argsStr, currentTarget.name);
-            if (parsed.errors.length > 0) {
-                for (const e of parsed.errors)
-                    result.parseErrors.push(e);
-                continue;
-            }
-            if (fallback !== undefined)
-                parsed.params.fallback = processSetValue(fallback);
-            opBucket.push({
-                kind: ">",
-                body: stripped0,
-                outputVar: outputVar,
-                retrievalParams: parsed.params,
-            });
+            result.parseErrors.push(`Legacy \`>\` retrieval op in target '${currentTarget.name}' is no longer supported. ` +
+                `Use \`$ data_read mode="fts|semantic|rerank" query="..." limit=N -> R\` (or qualify the connector: \`$ <connector>.data_read ...\`).`);
             continue;
         }
         if (stripped0.startsWith("~ ")) {
-            const match = LOCAL_MODEL_OP_REGEX.exec(stripped0);
-            if (!match) {
-                result.parseErrors.push(`Malformed \`~\` op in target '${currentTarget.name}' — expected \`~ key=value ... -> VARNAME [(fallback: "value")]\``);
-                continue;
-            }
-            const [, argsStr, outputVar, fallback] = match;
-            const parsed = parseLocalModelArgs(argsStr, currentTarget.name);
-            if (parsed.errors.length > 0) {
-                for (const e of parsed.errors)
-                    result.parseErrors.push(e);
-                continue;
-            }
-            if (fallback !== undefined)
-                parsed.params.fallback = processSetValue(fallback);
-            opBucket.push({
-                kind: "~",
-                body: stripped0,
-                outputVar: outputVar,
-                localModelParams: parsed.params,
-            });
+            result.parseErrors.push(`Legacy \`~\` LocalModel op in target '${currentTarget.name}' is no longer supported. ` +
+                `Use \`$ llm prompt="..." [maxTokens=N] [model="..."] -> R\` (op-level \`timeout=N\` kwarg and trailing \`(fallback: "value")\` are honored).`);
             continue;
         }
         if (stripped0.startsWith("& ")) {
-            const match = AMPERSAND_OP_REGEX.exec(stripped0);
-            if (!match) {
-                result.parseErrors.push(`Malformed \`&\` op in target '${currentTarget.name}' — expected \`& skill-name [key=value ...] [-> VARNAME]\``);
-                continue;
-            }
-            const [, skillName, argsStr, outputVar, ampFallback] = match;
-            const args = {};
-            const tokens = tokenizeKeywordArgs(argsStr ?? "");
-            let argError = false;
-            for (const tok of tokens) {
-                const eq = tok.indexOf("=");
-                if (eq === -1) {
-                    result.parseErrors.push(`Malformed \`&\` arg '${tok}' in target '${currentTarget.name}' — expected key=value`);
-                    argError = true;
-                    continue;
-                }
-                args[tok.slice(0, eq).trim()] = processSetValue(tok.slice(eq + 1));
-            }
-            if (argError)
-                continue;
-            const ampOp = {
-                kind: "&",
-                body: stripped0,
-                ampParams: { skillName: skillName, args },
-            };
-            if (outputVar !== undefined)
-                ampOp.outputVar = outputVar;
-            if (ampFallback !== undefined)
-                ampOp.fallback = processSetValue(ampFallback);
-            opBucket.push(ampOp);
+            result.parseErrors.push(`Legacy \`&\` inline op in target '${currentTarget.name}' is no longer supported. ` +
+                `Use \`inline(skill="...")\` for compile-time data-skill inlines, or \`execute_skill(name="...", ...) -> R\` for runtime composition.`);
             continue;
         }
         if (stripped0.startsWith("foreach ")) {
@@ -1515,34 +1348,21 @@ export function parse(source) {
                     }
                     const text = kwArgs["text"] ?? "";
                     opBucket.push({
-                        kind: "!",
+                        kind: "emit",
                         body: text,
                         ...(approved !== undefined ? { approved } : {}),
-                        sourceForm: "function-call",
-                    });
-                    continue;
-                }
-                if (fnName === "ask") {
-                    const prompt = kwArgs["prompt"] ?? "";
-                    opBucket.push({
-                        kind: "??",
-                        body: prompt,
-                        ...(outputVar !== undefined ? { outputVar } : {}),
-                        ...(approved !== undefined ? { approved } : {}),
-                        sourceForm: "function-call",
                     });
                     continue;
                 }
                 if (fnName === "inline") {
                     const skill = kwArgs["skill"] ?? "";
                     opBucket.push({
-                        kind: "&",
+                        kind: "inline",
                         body: stripped0,
                         ampParams: { skillName: skill, args: {} },
                         ...(outputVar !== undefined ? { outputVar } : {}),
                         ...(fallback !== undefined ? { fallback } : {}),
                         ...(approved !== undefined ? { approved } : {}),
-                        sourceForm: "function-call",
                     });
                     continue;
                 }
@@ -1568,7 +1388,6 @@ export function parse(source) {
                         ...(outputVar !== undefined ? { outputVar } : {}),
                         ...(fallback !== undefined ? { fallback } : {}),
                         ...(approved !== undefined ? { approved } : {}),
-                        sourceForm: "function-call",
                     });
                     continue;
                 }
@@ -1576,13 +1395,12 @@ export function parse(source) {
                     const command = kwArgs["command"] ?? "";
                     const unsafe = kwArgs["unsafe"] === "true";
                     opBucket.push({
-                        kind: "@",
+                        kind: "shell",
                         body: command,
                         ...(unsafe ? { policy: "unsafe" } : {}),
                         ...(outputVar !== undefined ? { outputVar } : {}),
                         ...(fallback !== undefined ? { fallback } : {}),
                         ...(approved !== undefined ? { approved } : {}),
-                        sourceForm: "function-call",
                     });
                     continue;
                 }
@@ -1594,7 +1412,6 @@ export function parse(source) {
                         fileParams: { path },
                         ...(outputVar !== undefined ? { outputVar } : {}),
                         ...(fallback !== undefined ? { fallback } : {}),
-                        sourceForm: "function-call",
                     });
                     continue;
                 }
@@ -1607,7 +1424,6 @@ export function parse(source) {
                         fileParams: { path, content },
                         ...(outputVar !== undefined ? { outputVar } : {}),
                         ...(approved !== undefined ? { approved } : {}),
-                        sourceForm: "function-call",
                     });
                     continue;
                 }
@@ -1655,7 +1471,6 @@ export function parse(source) {
                         ...(outputVar !== undefined ? { outputVar } : {}),
                         ...(fallback !== undefined ? { fallback } : {}),
                         ...(approved !== undefined ? { approved } : {}),
-                        sourceForm: "function-call",
                     });
                     continue;
                 }
@@ -1670,19 +1485,11 @@ export function parse(source) {
         let kind = null;
         let body = "";
         let mcpConnectorForOp = undefined;
-        let atPolicy = undefined;
-        let atOutputVar = undefined;
-        let atFallback = undefined;
-        // Check `??` before `?`, `$set` before `$`.
+        // Check `??`/`$set` before bare `?`/`$`.
         if (stripped.startsWith("?? ") || stripped === "??") {
-            const tail = stripped.slice(3).trim();
-            const m = /^(.+?)\s+->\s+([A-Za-z_]\w*)\s*$/.exec(tail);
-            if (m !== null) {
-                opBucket.push({ kind: "??", body: m[1].trim(), outputVar: m[2] });
-            }
-            else {
-                opBucket.push({ kind: "??", body: tail });
-            }
+            result.parseErrors.push(`Legacy \`??\` ask op in target '${currentTarget.name}' is no longer supported. ` +
+                `\`ask\` was removed in v0.16.0 — it conflated user-surfacing (which the runtime can't guarantee a channel for) with mutation-gating (already covered by \`approved="reason"\` per-op kwarg + \`# Autonomous: true\` skill flag). ` +
+                `For input, use \`emit(text="...")\` and have the caller handle the round-trip. For mutation authorization, use \`approved=\` or \`# Autonomous:\`.`);
             continue;
         }
         else if (stripped.startsWith("$set ") || stripped === "$set") {
@@ -1696,6 +1503,30 @@ export function parse(source) {
                     setValue: processSetValue(rawValue),
                 });
             }
+            else {
+                // Malformed `$set` no longer silently drops. Diagnose the
+                // specific shape so the author sees the cause, not a downstream
+                // `undeclared-var` blaming the symptom. Sibling to v0.9.2 P0.8
+                // (`$append VAR =`) + qwen-test P0.5 (`$<word>`) treatments.
+                const tail = stripped.slice(4).trim();
+                let detail;
+                if (tail === "") {
+                    detail = "missing variable name and `=` assignment. Canonical: `$set VAR = value`.";
+                }
+                else if (!tail.includes("=")) {
+                    detail = `'${tail.slice(0, 40)}' has no \`=\` assignment. Canonical: \`$set VAR = value\` (the \`=\` is required).`;
+                }
+                else if (/^\d/.test(tail)) {
+                    detail = `'${tail.slice(0, 40)}' starts with a digit. Variable names must start with a letter or underscore.`;
+                }
+                else if (/^[A-Za-z_]\w*\.[A-Za-z_]/.test(tail)) {
+                    detail = `'${tail.slice(0, 40)}' uses dotted target. \`$set\` binds top-level variables only; dotted writes aren't supported. Bind a parent var first via \`$set PARENT = {...}\` then mutate via \`$ json_parse\` + structured ops.`;
+                }
+                else {
+                    detail = `'${tail.slice(0, 40)}' doesn't match the \`VAR = value\` shape. Variable names: \`[A-Za-z_]\\w*\`. Canonical: \`$set VAR = value\`.`;
+                }
+                result.parseErrors.push(`Malformed \`$set\` op in target '${currentTarget.name}': ${detail}`);
+            }
             continue;
         }
         else if (stripped.startsWith("$append ") || stripped === "$append") {
@@ -1771,45 +1602,22 @@ export function parse(source) {
             body = stripped.slice(2).trim();
         }
         else if (stripped.startsWith("@ ") || stripped === "@") {
-            kind = "@";
-            let tail = stripped.slice(2).trim();
-            // Optional output binding: `-> VAR [(fallback: "...")]` at end of line.
-            // v0.2.4 Bug F: the trailing `(fallback: ...)` clause is now supported
-            // for parity with $/~/> ops — cold authors reach for op-level fallback
-            // as a defensive-coding posture and previously hit silent
-            // outputVar-not-bound failures.
-            const outMatch = /^(.+?)\s+->\s+([A-Za-z_]\w*)(?:\s+\(fallback\s*:\s*(.+?)\))?\s*$/.exec(tail);
-            if (outMatch !== null) {
-                atOutputVar = outMatch[2];
-                if (outMatch[3] !== undefined)
-                    atFallback = processSetValue(outMatch[3]);
-                tail = outMatch[1].trim();
-            }
-            // `@ unsafe <command>` — `unsafe` as literal first token signals
-            // opt-in full-shell exec (vs default structured-spawn sandbox).
-            const unsafeMatch = /^unsafe(?:\s+(.*))?$/.exec(tail);
-            if (unsafeMatch !== null) {
-                atPolicy = "unsafe";
-                body = (unsafeMatch[1] ?? "").trim();
-            }
-            else {
-                body = tail;
-            }
+            result.parseErrors.push(`Legacy \`@\` shell op in target '${currentTarget.name}' is no longer supported. ` +
+                `Use \`shell(command="...") [-> R] [(fallback: "...")]\` (add \`unsafe=true\` kwarg for full-shell exec; runtime opt-in still required).`);
+            continue;
         }
         else if (stripped.startsWith("! ") || stripped === "!") {
-            kind = "!";
-            body = stripped.slice(2).trim();
+            result.parseErrors.push(`Legacy \`!\` emit op in target '${currentTarget.name}' is no longer supported. ` +
+                `Use \`emit(text="...")\`.`);
+            continue;
         }
         if (kind !== null) {
-            // v0.9.4 — N1 also extract `approved=` for the no-binding `$` op path
+            // N1: extract `approved=` for the no-binding `$` op path.
             const approvedKwarg = kind === "$" ? extractApprovedKwarg(body) : undefined;
             opBucket.push({
                 kind,
                 body,
                 ...(mcpConnectorForOp !== undefined ? { mcpConnector: mcpConnectorForOp } : {}),
-                ...(atPolicy !== undefined ? { policy: atPolicy } : {}),
-                ...(atOutputVar !== undefined ? { outputVar: atOutputVar } : {}),
-                ...(atFallback !== undefined ? { fallback: atFallback } : {}),
                 ...(approvedKwarg !== undefined ? { approved: approvedKwarg } : {}),
             });
             continue;
@@ -1826,7 +1634,7 @@ export function parse(source) {
             result.parseErrors.push(`Unknown block-introducer '${keyword}:' in target '${currentTarget.name}'. ` +
                 `Skillscript recognizes \`if COND:\`, \`elif COND:\`, \`else:\`, and \`foreach IT in $(LIST):\` ` +
                 `at body scope (target-level \`else:\` is the error handler). ` +
-                `Composition is via \`& skill-name\` (data-skill inline) or \`$ execute_skill skill_name="..."\` (in-skill invocation), not block syntax.`);
+                `Composition is via \`inline(skill="...")\` (data-skill inline) or \`execute_skill(name="...")\` (in-skill invocation), not block syntax.`);
             scopeStack.push({
                 kind: "unknown-block",
                 target: currentTarget,