automata-cli 0.1.0-feature-032-message-tool-model.258 → 0.1.0-feature-032-message-tool-model.260

package/dist/index.js

@@ -2978,8 +2978,8 @@ function composePrompt(input) {
 
 // src/github/runDirective.ts
 var VALID_TOOLS = ["claude", "codex"];
-var TOOL_PATTERN = /(?<![A-Za-z0-9_:-])tool:([A-Za-z0-9._-]+)/gi;
-var MODEL_PATTERN = /(?<![A-Za-z0-9_:-])model:([A-Za-z0-9._/+@-]+)/gi;
+var TOOL_PATTERN = /(?<![a-z0-9_:-])tool:([a-z0-9._-]+)/gi;
+var MODEL_PATTERN = /(?<![a-z0-9_:-])model:([a-z0-9._/+@-]+)/gi;
 function lastCapture(body, pattern) {
   const matches = [...body.matchAll(new RegExp(pattern.source, pattern.flags))];
   return matches.at(-1)?.[1];
@@ -3020,6 +3020,11 @@ function triggeringMessage(item) {
 function isExecutor(value) {
   return VALID_TOOLS.includes(value);
 }
+function baselineExecutorSource(withOption, configExecutor) {
+  if (withOption !== void 0) return "option";
+  if (configExecutor !== void 0) return "config";
+  return "default";
+}
 function trimmed(value) {
   if (value === void 0) return void 0;
   const cleaned = value.trim();
@@ -3037,7 +3042,7 @@ function resolveExecution(input) {
     return { ok: false, invalidTool: directive.tool };
   }
   const baseline = withOption ?? configExecutor ?? input.defaultExecutor;
-  const baselineSource = withOption !== void 0 ? "option" : configExecutor !== void 0 ? "config" : "default";
+  const baselineSource = baselineExecutorSource(withOption, configExecutor);
   const executor = directive.tool ?? baseline;
   const executorSource = directive.tool === void 0 ? baselineSource : "message";
   const switched = directive.tool !== void 0 && directive.tool !== baseline;
@@ -3062,7 +3067,8 @@ function describeExecution(execution) {
   return `${execution.executor}${model}${effort}${fromMessage}`;
 }
 function describeInvalidTool(invalidTool) {
-  return `the newest message asks for \`tool:${invalidTool}\`, which is not an executor automata knows (valid values are ${VALID_TOOLS.map((tool) => `\`${tool}\``).join(" and ")})`;
+  const valid = VALID_TOOLS.map((tool) => `\`${tool}\``).join(" and ");
+  return `the newest message asks for \`tool:${invalidTool}\`, which is not an executor automata knows (valid values are ${valid})`;
 }
 
 // src/github/markerReconciliation.ts
@@ -3888,6 +3894,18 @@ function repairIssueLink(item, baseBranch) {
     return false;
   }
 }
+function refuseBeforeRun(base, marker, detail, markerText) {
+  progress(`  failed: ${detail}
+`);
+  inFlightMarker = null;
+  try {
+    updateMarker(marker, markerText);
+  } catch (err) {
+    progress(`  warning: could not update the marker comment: ${err.message}
+`);
+  }
+  return { ...base, outcome: "failed", detail };
+}
 async function processItem(planned, settings, silent) {
   progress(`
 #${String(planned.issue.number)} ${planned.turn}: ${planned.reason}
@@ -3956,37 +3974,22 @@ async function processItem(planned, settings, silent) {
   });
   const oversized = describeOversizedPrompt(prompt);
   if (oversized !== null) {
-    const detail = oversized;
-    progress(`  failed: ${detail}
-`);
-    inFlightMarker = null;
-    try {
-      updateMarker(
-        marker,
-        `automata do-work: could not start a run because ${detail} Summarise the discussion in a new issue, or shorten the thread, and try again.`
-      );
-    } catch (err) {
-      progress(`  warning: could not update the marker comment: ${err.message}
-`);
-    }
-    return { ...base, outcome: "failed", detail };
+    return refuseBeforeRun(
+      base,
+      marker,
+      oversized,
+      `automata do-work: could not start a run because ${oversized} Summarise the discussion in a new issue, or shorten the thread, and try again.`
+    );
   }
   const resolved = resolveItemExecution(item, settings);
   if (!resolved.ok) {
     const detail = describeInvalidTool(resolved.invalidTool);
-    progress(`  failed: ${detail}
-`);
-    inFlightMarker = null;
-    try {
-      updateMarker(
-        marker,
-        `automata do-work: ${detail}. No run was started. Reply here with a corrected directive, or none at all, to have another attempt made.`
-      );
-    } catch (err) {
-      progress(`  warning: could not update the marker comment: ${err.message}
-`);
-    }
-    return { ...base, outcome: "failed", detail };
+    return refuseBeforeRun(
+      base,
+      marker,
+      detail,
+      `automata do-work: ${detail}. No run was started. Reply here with a corrected directive, or none at all, to have another attempt made.`
+    );
   }
   const execution = toExecution(resolved);
   let runError = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "automata-cli",
-  "version": "0.1.0-feature-032-message-tool-model.258",
+  "version": "0.1.0-feature-032-message-tool-model.260",
   "description": "Automata CLI tool",
   "type": "module",
   "engines": {