akm-cli 0.9.0-rc.8 → 0.9.0

package/dist/tasks/backends/schtasks.js

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 /**
- * schtasks.exe backend for `akm tasks` (Windows default).
+ * schtasks.exe backend for `akm task` (Windows default).
  *
  * Each task is registered under the `\akm\` Task Scheduler folder so the
  * backend never touches user-managed tasks. The full task definition is
@@ -37,7 +37,7 @@ import { ConfigError } from "../../core/errors.js";
 import { getTaskLogDir } from "../../core/paths.js";
 import { resolveAkmInvocation } from "../resolve-akm-bin.js";
 import { parseSchedule, translateToSchtasks } from "../schedule.js";
-import { buildScheduledTaskInvocation, resolveScheduledTaskContext, } from "../scheduler-invocation.js";
+import { buildScheduledTaskInvocation, parseScheduledTaskArgv, resolveScheduledTaskContext, schedulerContextDescriptor, schedulerContextPath, } from "../scheduler-invocation.js";
 import { escapeXml, nodeExec, nodeFs, normalizeXmlForUtf16File, runOrThrow, } from "./exec-utils.js";
 export const DEFAULT_FOLDER_PREFIX = "\\akm\\";
 const SIGNATURE_PREFIX = "akm:v1:";
@@ -48,12 +48,19 @@ export function SCHTASKS_BACKEND(options = {}) {
     const logDir = options.logDir ?? getTaskLogDir();
     const folder = options.folderPrefix ?? DEFAULT_FOLDER_PREFIX;
     const scheduledContext = options.scheduledContext ?? resolveScheduledTaskContext();
+    const defaultContextPath = schedulerContextPath(schedulerContextDescriptor(scheduledContext, process.env.PATH ?? ""));
     const userSid = options.userSid ?? resolveCurrentUserSid(exec);
     const taskName = (id) => `${folder}${id}`;
     return {
         name: "schtasks",
-        install(task) {
-            const xml = normalizeXmlForUtf16File(buildSchtasksXml(task, akmArgv, logDir, { folderPrefix: folder, scheduledContext, userSid }));
+        install(task, opts) {
+            const xml = normalizeXmlForUtf16File(buildSchtasksXml(task, akmArgv, logDir, {
+                folderPrefix: folder,
+                contextPath: opts?.contextPath ?? defaultContextPath,
+                userSid,
+                binding: [...(opts?.binding ?? akmArgv)],
+                ...(opts?.target !== undefined ? { target: opts.target } : {}),
+            }));
             const query = runOrThrow(exec, ["schtasks", "/Query", "/TN", taskName(task.id), "/XML"], {
                 isOk: (r) => r.status === 0 || isMissingTaskResult(r),
                 message: (r) => `schtasks /Query failed (exit ${r.status}): ${r.stderr || r.stdout || "no output"}.`,
@@ -146,26 +153,142 @@ export function SCHTASKS_BACKEND(options = {}) {
                     ids.push(name.slice(folder.length));
                 }
             }
-            return ids.map((id) => {
+            const refs = [];
+            for (const id of ids) {
                 const query = runOrThrow(exec, ["schtasks", "/Query", "/TN", taskName(id), "/XML"], {
                     message: (r) => `schtasks /Query /XML for "${taskName(id)}" failed (exit ${r.status}): ${r.stderr || r.stdout || "no output"}.`,
                 });
                 const signature = installedSignature(query.stdout);
-                return signature === undefined ? { id } : { id, signature };
+                const installed = extractSchtasksInvocation(query.stdout);
+                // An invocation that no longer parses (e.g. a pre-0.9 `tasks run`
+                // entry surviving the scheduler-ABI respelling) is an orphan of its
+                // marker id, not a hard failure: omit it so `akmTasksSync` treats the
+                // id as "not present" and reinstalls it from the current task file.
+                if (!installed)
+                    continue;
+                refs.push({
+                    id,
+                    ...(signature !== undefined ? { signature } : {}),
+                    ...(installed.target !== undefined ? { target: installed.target } : {}),
+                    binding: installed.binding,
+                    contextPath: installed.contextPath,
+                });
+            }
+            return refs;
+        },
+        listForRebind() {
+            const r = runOrThrow(exec, ["schtasks", "/Query", "/FO", "CSV", "/NH"], {
+                message: (res) => `schtasks /Query failed (exit ${res.status}): ${res.stderr || res.stdout || "no output"}.`,
             });
+            const refs = [];
+            for (const line of (r.stdout ?? "").split(/\r?\n/)) {
+                const match = line.match(/^"([^"]+)",/);
+                const name = match?.[1];
+                if (!name?.startsWith(folder))
+                    continue;
+                const id = name.slice(folder.length);
+                const query = runOrThrow(exec, ["schtasks", "/Query", "/TN", taskName(id), "/XML"], {
+                    message: (result) => `schtasks /Query /XML for "${taskName(id)}" failed (exit ${result.status}): ${result.stderr || result.stdout || "no output"}.`,
+                });
+                const signature = installedSignature(query.stdout);
+                const installed = extractSchtasksInvocation(query.stdout);
+                refs.push({
+                    id,
+                    ...(signature !== undefined ? { signature } : {}),
+                    ...(installed?.target !== undefined ? { target: installed.target } : {}),
+                });
+            }
+            return refs;
         },
-        expectedSignature(task) {
-            const signature = taskXmlSignature(buildSchtasksXml(task, akmArgv, logDir, { folderPrefix: folder, scheduledContext, userSid }));
+        expectedSignature(task, opts) {
+            const signature = taskXmlSignature(buildSchtasksXml(task, akmArgv, logDir, {
+                folderPrefix: folder,
+                contextPath: opts?.contextPath ?? defaultContextPath,
+                userSid,
+                binding: [...(opts?.binding ?? akmArgv)],
+                ...(opts?.target !== undefined ? { target: opts.target } : {}),
+            }));
             if (signature === undefined)
                 throw new Error("Failed to fingerprint generated Task Scheduler XML.");
             return signature;
         },
     };
 }
+/**
+ * Recover the bundle name embedded as a `--bundle <bundle>` pair in the
+ * PowerShell `<Arguments>` of an installed Task Scheduler definition. Returns
+ * undefined for the primary/default form.
+ */
+export function extractSchtasksTarget(xml) {
+    return extractSchtasksInvocation(xml)?.target;
+}
+export function extractSchtasksInvocation(xml) {
+    const argsElement = xml.match(/<(?:[\w.-]+:)?Arguments>([\s\S]*?)<\/(?:[\w.-]+:)?Arguments>/i);
+    if (!argsElement)
+        return undefined;
+    const commandLine = decodeXml(argsElement[1]);
+    const invocationStart = findPowerShellInvocationOperator(commandLine);
+    if (invocationStart === undefined)
+        return undefined;
+    return parseScheduledTaskArgv(parsePowerShellSingleQuotedArgs(commandLine, invocationStart + 1));
+}
+function findPowerShellInvocationOperator(script) {
+    let inSingleQuote = false;
+    for (let index = 0; index < script.length; index += 1) {
+        const char = script[index];
+        if (char === "'") {
+            if (inSingleQuote && script[index + 1] === "'") {
+                index += 1;
+            }
+            else {
+                inSingleQuote = !inSingleQuote;
+            }
+            continue;
+        }
+        if (!inSingleQuote && char === "&" && /\s/.test(script[index + 1] ?? ""))
+            return index;
+    }
+    return undefined;
+}
+function parsePowerShellSingleQuotedArgs(script, start) {
+    const argv = [];
+    let index = start;
+    while (index < script.length) {
+        while (/\s/.test(script[index] ?? ""))
+            index += 1;
+        if (script[index] === ";" || script[index] === '"' || index >= script.length)
+            break;
+        if (script[index] !== "'")
+            return [];
+        index += 1;
+        let value = "";
+        let closed = false;
+        while (index < script.length) {
+            const char = script[index];
+            if (char !== "'") {
+                value += char;
+                index += 1;
+                continue;
+            }
+            if (script[index + 1] === "'") {
+                value += "'";
+                index += 2;
+                continue;
+            }
+            index += 1;
+            closed = true;
+            break;
+        }
+        if (!closed)
+            return [];
+        argv.push(value);
+    }
+    return argv;
+}
 export function buildSchtasksXml(task, akmArgv, logDir, options) {
     const folder = options.folderPrefix ?? DEFAULT_FOLDER_PREFIX;
     const now = options.now ? options.now() : new Date();
-    const definition = buildSchtasksDefinition(task, akmArgv, logDir, folder, options.scheduledContext, options.userSid);
+    const definition = buildSchtasksDefinition(task, options.binding ?? akmArgv, logDir, folder, options.contextPath, options.userSid, options.target);
     const triggerXml = renderSchtasksTrigger(definition.trigger, now);
     return schtasksTemplate
         .replaceAll("{{TASK_ID}}", escapeXml(task.id))
@@ -178,15 +301,12 @@ export function buildSchtasksXml(task, akmArgv, logDir, options) {
         .replace("{{ARGS}}", escapeXml(definition.args))
         .replace("{{LOG_PATH}}", escapeXml(definition.logPath));
 }
-function buildSchtasksDefinition(task, akmArgv, logDir, folder, scheduledContext, userSid) {
+function buildSchtasksDefinition(task, akmArgv, logDir, folder, contextPath, userSid, target) {
     const spec = parseSchedule(task.schedule, "schtasks");
     const trigger = translateToSchtasks(spec);
-    const invocation = buildScheduledTaskInvocation(akmArgv, task.id, scheduledContext);
-    const environment = Object.entries(invocation.environment)
-        .map(([key, value]) => `$env:${key}=${quotePowerShell(value)}`)
-        .join("; ");
+    const invocation = buildScheduledTaskInvocation(akmArgv, task.id, contextPath, target);
     const invoke = `& ${invocation.argv.map((arg) => quotePowerShell(arg)).join(" ")}`;
-    const script = `${environment}; ${invoke}; exit $LASTEXITCODE`;
+    const script = `${invoke}; exit $LASTEXITCODE`;
     const command = "powershell.exe";
     const args = ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", script].map(quoteArg).join(" ");
     const logPath = path.join(logDir, `${task.id}.log`);

package/dist/tasks/embedded.js

@@ -2,14 +2,18 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 /**
- * Embedded core task templates.
+ * Embedded task templates.
  *
- * A curated set of read-only YAML task templates ships inside the akm binary
- * under `src/assets/tasks/core/`. They are resolved at runtime via
+ * Curated sets of read-only YAML task templates ship inside the akm binary
+ * under `src/assets/tasks/<category>/` — `core/` (general-purpose maintenance)
+ * and `improve/` (the maintainer-oriented multi-cadence improve schedule,
+ * folded in from the retired `registerDefaultTasks`/`akm tasks init` path in
+ * 0.9, S6). Every category subdirectory is enumerated the same way; adding a
+ * new one needs no code change here. Templates are resolved at runtime via
  * `import.meta.dir` (mirroring `SKELETON_DIR` in
  * src/commands/stash-skeleton.ts) and are NOT written to any stash at
- * install/init time — the `akm setup` wizard copies a template into the
- * primary stash only when the user opts in (copy-on-enable).
+ * install time — the `akm setup` wizard copies a template into the primary
+ * stash only when the user opts in (copy-on-enable).
  *
  * Each entry exposes the parsed `command`, `schedule`, and `description`
  * alongside the raw `yaml`, so the wizard can both render a choice and write
@@ -17,57 +21,69 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { parse as yamlParse } from "yaml";
 import { getDirname } from "../runtime.js";
-/** Directory holding the bundled core task templates. */
-const CORE_TASKS_DIR = path.join(getDirname(import.meta.url), "../assets/tasks/core");
+import { parseTaskDocument } from "./parser.js";
+/** Directory holding the bundled task template categories. */
+const TASKS_ASSETS_DIR = path.join(getDirname(import.meta.url), "../assets/tasks");
 /**
- * Enumerate the embedded core task templates from the bundled assets
- * directory. Sorted by id for deterministic ordering. Returns an empty array
- * if the directory is missing (defensive — a build without assets should not
- * crash the wizard).
+ * Enumerate the embedded task templates from every category subdirectory of
+ * the bundled assets directory. Sorted by category then id for deterministic
+ * ordering. Returns an empty array if the directory is missing (defensive —
+ * a build without assets should not crash the wizard).
  */
 export function listEmbeddedTasks() {
-    let entries;
+    let categories;
     try {
-        entries = fs.readdirSync(CORE_TASKS_DIR);
+        categories = fs
+            .readdirSync(TASKS_ASSETS_DIR, { withFileTypes: true })
+            .filter((entry) => entry.isDirectory())
+            .map((entry) => entry.name)
+            .sort();
     }
     catch {
         return [];
     }
     const tasks = [];
-    for (const entry of entries.sort()) {
-        if (!entry.endsWith(".yml"))
-            continue;
-        const id = entry.slice(0, -4);
-        const filePath = path.join(CORE_TASKS_DIR, entry);
-        let yaml;
+    for (const category of categories) {
+        const categoryDir = path.join(TASKS_ASSETS_DIR, category);
+        let entries;
         try {
-            yaml = fs.readFileSync(filePath, "utf8");
+            entries = fs.readdirSync(categoryDir);
         }
         catch {
             continue;
         }
-        let doc;
-        try {
-            doc = yamlParse(yaml) ?? {};
-        }
-        catch {
-            continue;
+        for (const entry of entries.sort()) {
+            if (!entry.endsWith(".yml"))
+                continue;
+            const id = entry.slice(0, -4);
+            const filePath = path.join(categoryDir, entry);
+            let yaml;
+            try {
+                yaml = fs.readFileSync(filePath, "utf8");
+            }
+            catch {
+                continue;
+            }
+            let task;
+            try {
+                task = parseTaskDocument({ yaml, filePath, id });
+            }
+            catch {
+                continue;
+            }
+            if (task.target.kind !== "command")
+                continue;
+            tasks.push({
+                id,
+                label: `${category}/${id}`,
+                command: task.target.cmd.join(" "),
+                schedule: task.schedule,
+                description: task.description ?? "",
+                enabled: task.enabled,
+                yaml,
+            });
         }
-        const command = typeof doc.command === "string" ? doc.command : "";
-        const schedule = typeof doc.schedule === "string" ? doc.schedule : "";
-        const description = typeof doc.description === "string" ? doc.description : "";
-        const enabled = doc.enabled !== false;
-        tasks.push({
-            id,
-            label: `core/${id}`,
-            command,
-            schedule,
-            description,
-            enabled,
-            yaml,
-        });
     }
     return tasks;
 }

package/dist/tasks/parser.js

@@ -13,7 +13,7 @@
  * params:
  *   region: us-east-1
  * # ...or:
- * prompt: agent:my-agent            # asset ref
+ * prompt: agents/my-agent           # asset ref
  * # ...or:
  * prompt: ./prompts/my-prompt.md    # relative file path
  * # ...or:
@@ -21,7 +21,7 @@
  *   Do the thing.
  *   And the other thing.
  * # ...or:
- * command: akm improve --auto-accept=90 --limit 25
+ * command: akm improve --strategy quick --limit 25
  * enabled: true                     # default true
  * name: Daily backup
  * description: …
@@ -35,11 +35,9 @@
  */
 import path from "node:path";
 import { parse as parseYaml } from "yaml";
-import { stashDirFor } from "../core/asset/asset-placement.js";
 import { isFullRefInput } from "../core/asset/resolve-ref.js";
 import { UsageError } from "../core/errors.js";
 import { formatExtraParamsIssue, validateExtraParams } from "../core/extra-params.js";
-import { findBareAkmExecutableIndex } from "./command-executable.js";
 import { TASK_SCHEMA_VERSION } from "./schema.js";
 import { validateTaskId } from "./task-id.js";
 export function parseTaskDocument(input) {
@@ -58,9 +56,6 @@ export function parseTaskDocument(input) {
             throw err;
         throw new UsageError(`Task "${id}" has invalid YAML: ${err instanceof Error ? err.message : String(err)}. File: ${filePath}`, "INVALID_FLAG_VALUE");
     }
-    const legacy = data.version === undefined || data.version === 1;
-    if (legacy)
-        data = normalizeV1Task(data, filePath);
     requireVersion(data, id, filePath);
     rejectUnknownKeys(data, id, filePath);
     const schedule = requireString(data.schedule, "schedule", filePath);
@@ -97,9 +92,7 @@ export function parseTaskDocument(input) {
     }
     else if (hasCommand) {
         rejectTargetFields(data, ["timeoutMs"], id, filePath);
-        const parsedCommand = readCommand(data.command, filePath, id);
-        const cmd = legacy ? normalizeV1Command(parsedCommand) : parsedCommand;
-        target = { kind: "command", cmd };
+        target = { kind: "command", cmd: readCommand(data.command, filePath, id) };
     }
     else {
         rejectTargetFields(data, ["engine", "model", "timeoutMs", "llm"], id, filePath);
@@ -109,7 +102,7 @@ export function parseTaskDocument(input) {
         }
         const engine = optionalString(data.engine, "engine", filePath);
         const model = optionalString(data.model, "model", filePath);
-        const timeoutMs = readTimeout(data.timeoutMs, filePath, legacy);
+        const timeoutMs = readTimeout(data.timeoutMs, filePath);
         const llm = readLlmOverrides(data.llm, filePath);
         target = {
             kind: "prompt",
@@ -120,7 +113,7 @@ export function parseTaskDocument(input) {
             ...(llm ? { llm } : {}),
         };
     }
-    const timeoutMs = hasCommand ? readTimeout(data.timeoutMs, filePath, legacy) : undefined;
+    const timeoutMs = hasCommand ? readTimeout(data.timeoutMs, filePath) : undefined;
     return {
         version: TASK_SCHEMA_VERSION,
         schemaVersion: TASK_SCHEMA_VERSION,
@@ -154,133 +147,6 @@ const TASK_KEYS = new Set([
     "llm",
 ]);
 const SHARED_KEYS = new Set(["version", "name", "description", "when_to_use", "tags", "schedule", "enabled"]);
-/** Lower the complete permissive 0.8 task shape into the strict v2 reader shape. */
-function normalizeV1Task(data, filePath) {
-    const normalized = { version: TASK_SCHEMA_VERSION };
-    for (const key of ["schedule", "workflow", "prompt", "command", "name", "description", "when_to_use"]) {
-        const value = data[key];
-        if (value === undefined || value === null)
-            continue;
-        if (key === "command" && Array.isArray(value)) {
-            normalized[key] = value.filter((part) => typeof part === "string" && part.trim().length > 0);
-        }
-        else if (key === "command") {
-            normalized[key] = value;
-        }
-        else if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-            normalized[key] = String(value).trim();
-        }
-        else {
-            normalized[key] = value;
-        }
-    }
-    normalized.enabled = data.enabled === undefined ? true : data.enabled === true;
-    if (typeof data.tags === "string") {
-        normalized.tags = data.tags
-            .split(/[\s,]+/)
-            .map((tag) => tag.trim())
-            .filter(Boolean);
-    }
-    else if (Array.isArray(data.tags)) {
-        normalized.tags = data.tags.filter((tag) => typeof tag === "string" && tag.trim().length > 0);
-    }
-    const hasWorkflow = "workflow" in data && data.workflow !== "" && data.workflow != null;
-    const hasPrompt = "prompt" in data && data.prompt !== "" && data.prompt != null;
-    if (hasWorkflow && data.params && typeof data.params === "object" && !Array.isArray(data.params)) {
-        normalized.params = data.params;
-    }
-    else if (hasWorkflow && typeof data.params === "string" && data.params.trim()) {
-        try {
-            const params = JSON.parse(data.params);
-            if (params && typeof params === "object" && !Array.isArray(params))
-                normalized.params = params;
-            else
-                normalized.params = data.params;
-        }
-        catch {
-            normalized.params = data.params;
-        }
-    }
-    if (hasPrompt && data.profile !== undefined && data.profile !== null) {
-        const profile = legacyString(data.profile);
-        if (profile === undefined) {
-            throw new UsageError(`Key "profile" must be a string. File: ${filePath}`, "INVALID_FLAG_VALUE");
-        }
-        if (profile)
-            normalized.engine = profile;
-    }
-    if (!hasWorkflow && "timeoutMs" in data) {
-        const timeout = data.timeoutMs;
-        if (timeout === null || timeout === "null" || timeout === 0 || (typeof timeout === "number" && timeout < 0)) {
-            normalized.timeoutMs = null;
-        }
-        else if (typeof timeout === "number" && timeout > 0) {
-            normalized.timeoutMs = timeout;
-        }
-    }
-    return normalized;
-}
-function legacyString(value) {
-    if (value === undefined || value === null)
-        return undefined;
-    if (typeof value === "string")
-        return value.trim();
-    if (typeof value === "number" || typeof value === "boolean")
-        return String(value);
-    return undefined;
-}
-/** Rewrite only the removed AKM spelling; arbitrary command arguments remain untouched. */
-function normalizeV1Command(cmd) {
-    const akmIndex = findBareAkmExecutableIndex(cmd);
-    if (akmIndex === undefined)
-        return cmd;
-    const improveIndex = findImproveSubcommandIndex(cmd, akmIndex);
-    if (improveIndex === undefined)
-        return cmd;
-    return cmd.map((part, index) => {
-        if (index <= improveIndex)
-            return part;
-        if (part === "--profile")
-            return "--strategy";
-        if (part.startsWith("--profile="))
-            return `--strategy=${part.slice("--profile=".length)}`;
-        return part;
-    });
-}
-const AKM_GLOBAL_BOOLEAN_OPTIONS = new Set([
-    "--quiet",
-    "-q",
-    "--verbose",
-    "--no-quiet",
-    "--no-verbose",
-    "--quiet=false",
-    "--verbose=false",
-]);
-const AKM_GLOBAL_VALUE_OPTIONS = new Set(["--format", "--output", "--detail", "--shape"]);
-function findImproveSubcommandIndex(cmd, akmIndex) {
-    let index = akmIndex + 1;
-    while (index < cmd.length) {
-        const part = cmd[index];
-        if (part === "improve")
-            return index;
-        if (AKM_GLOBAL_BOOLEAN_OPTIONS.has(part)) {
-            index += 1;
-            continue;
-        }
-        if (AKM_GLOBAL_VALUE_OPTIONS.has(part)) {
-            if (index + 1 >= cmd.length)
-                return undefined;
-            index += 2;
-            continue;
-        }
-        if ([...AKM_GLOBAL_VALUE_OPTIONS].some((option) => part.startsWith(`${option}=`) && part.length > option.length + 1)) {
-            index += 1;
-            continue;
-        }
-        return undefined;
-    }
-    return undefined;
-}
 function requireVersion(data, id, filePath) {
     if (data.version === TASK_SCHEMA_VERSION)
         return;
@@ -305,8 +171,7 @@ function rejectTargetFields(data, allowed, id, filePath) {
  *   • "[bundle//]<subdir>/<name>" (asset ref)  → asset
  *   • "./foo.md", "../foo.md", "/abs"          → file
  *   • "C:\\abs" (Windows absolute)             → file
- *   • "<type>:<name>" (retired colon grammar)  → typed UsageError
- *   • anything else (incl. block scalars)      → inline text
+ *   • anything else (including colon text and block scalars) → inline text
  */
 function resolvePromptSource(raw, filePath, id) {
     const trimmed = raw.trim();
@@ -326,19 +191,6 @@ function resolvePromptSource(raw, filePath, id) {
     if (isFullRefInput(trimmed)) {
         return { kind: "asset", ref: trimmed };
     }
-    // The pre-0.9.0 `type:name` colon grammar is retired (D-R3, ref-grammar
-    // decision). Reject it with a typed error naming the canonical form rather
-    // than silently degrading to inline text — mirrors `parseTaskRef`'s rejection
-    // of `task:<id>`.
-    const legacyColon = /^([a-z][a-z0-9_-]*):([^\s]+)/i.exec(trimmed);
-    if (legacyColon) {
-        const typeTok = legacyColon[1] ?? "";
-        const name = legacyColon[2] ?? "";
-        const subdir = stashDirFor(typeTok);
-        const canonical = subdir ? `${subdir}/${name}` : `<stash-subdir>/${name}`;
-        throw new UsageError(`Task "${id}" prompt uses the removed \`type:name\` ref grammar ("${trimmed}") — ` +
-            `use the canonical asset ref \`${canonical}\`. File: ${filePath}`, "INVALID_FLAG_VALUE");
-    }
     return { kind: "inline", text: trimmed };
 }
 function optionalString(value, key, filePath) {
@@ -401,13 +253,11 @@ function readParams(value, filePath) {
     }
     throw new UsageError(`Key "params" must be a mapping. File: ${filePath}`, "INVALID_FLAG_VALUE");
 }
-function readTimeout(value, filePath, legacy = false) {
+function readTimeout(value, filePath) {
     if (value === undefined)
         return undefined;
     if (value === null)
         return null;
-    if (legacy && typeof value === "number" && Number.isFinite(value) && value > 0)
-        return value;
     if (typeof value === "number" && Number.isInteger(value) && value > 0)
         return value;
     throw new UsageError(`Key "timeoutMs" must be a positive integer or null. File: ${filePath}`, "INVALID_FLAG_VALUE");