agent-state-machine 2.1.8 → 2.1.9

package/bin/cli.js

@@ -7,6 +7,7 @@ import { pathToFileURL, fileURLToPath } from 'url';
 import { WorkflowRuntime } from '../lib/index.js';
 import { setup } from '../lib/setup.js';
 import { generateSessionToken } from '../lib/remote/client.js';
+import { readRemotePathFromConfig, writeRemotePathToConfig } from '../lib/config-utils.js';
 
 import { startLocalServer } from '../vercel-server/local-server.js';
 
@@ -119,146 +120,6 @@ function resolveWorkflowEntry(workflowDir) {
   return null;
 }
 
-function findConfigObjectRange(source) {
-  const match = source.match(/export\s+const\s+config\s*=/);
-  if (!match) return null;
-  const startSearch = match.index + match[0].length;
-  const braceStart = source.indexOf('{', startSearch);
-  if (braceStart === -1) return null;
-
-  let depth = 0;
-  let inString = null;
-  let inLineComment = false;
-  let inBlockComment = false;
-  let escape = false;
-
-  for (let i = braceStart; i < source.length; i += 1) {
-    const ch = source[i];
-    const next = source[i + 1];
-
-    if (inLineComment) {
-      if (ch === '\n') inLineComment = false;
-      continue;
-    }
-
-    if (inBlockComment) {
-      if (ch === '*' && next === '/') {
-        inBlockComment = false;
-        i += 1;
-      }
-      continue;
-    }
-
-    if (inString) {
-      if (escape) {
-        escape = false;
-        continue;
-      }
-      if (ch === '\\') {
-        escape = true;
-        continue;
-      }
-      if (ch === inString) {
-        inString = null;
-      }
-      continue;
-    }
-
-    if (ch === '"' || ch === '\'' || ch === '`') {
-      inString = ch;
-      continue;
-    }
-
-    if (ch === '/' && next === '/') {
-      inLineComment = true;
-      i += 1;
-      continue;
-    }
-
-    if (ch === '/' && next === '*') {
-      inBlockComment = true;
-      i += 1;
-      continue;
-    }
-
-    if (ch === '{') {
-      depth += 1;
-    } else if (ch === '}') {
-      depth -= 1;
-      if (depth === 0) {
-        return { start: braceStart, end: i };
-      }
-    }
-  }
-
-  return null;
-}
-
-function readRemotePathFromConfig(configFile) {
-  const source = fs.readFileSync(configFile, 'utf-8');
-  const range = findConfigObjectRange(source);
-  if (!range) return null;
-  const configSource = source.slice(range.start, range.end + 1);
-  const match = configSource.match(/\bremotePath\s*:\s*(['"`])([^'"`]+)\1/);
-  return match ? match[2] : null;
-}
-
-function writeRemotePathToConfig(configFile, remotePath) {
-  const source = fs.readFileSync(configFile, 'utf-8');
-  const range = findConfigObjectRange(source);
-  const remoteLine = `remotePath: "${remotePath}"`;
-
-  if (!range) {
-    const hasConfigExport = /export\s+const\s+config\s*=/.test(source);
-    if (hasConfigExport) {
-      throw new Error('Config export is not an object literal; add remotePath manually.');
-    }
-    const trimmed = source.replace(/\s*$/, '');
-    const appended = `${trimmed}\n\nexport const config = {\n  ${remoteLine}\n};\n`;
-    fs.writeFileSync(configFile, appended);
-    return;
-  }
-
-  const configSource = source.slice(range.start, range.end + 1);
-  const remoteRegex = /\bremotePath\s*:\s*(['"`])([^'"`]*?)\1/;
-  let updatedConfigSource;
-
-  if (remoteRegex.test(configSource)) {
-    updatedConfigSource = configSource.replace(remoteRegex, remoteLine);
-  } else {
-    const inner = configSource.slice(1, -1);
-    const indentMatch = inner.match(/\n([ \t]+)\S/);
-    const indent = indentMatch ? indentMatch[1] : '  ';
-    const trimmedInner = inner.replace(/\s*$/, '');
-    const hasContent = trimmedInner.trim().length > 0;
-    let updatedInner = trimmedInner;
-
-    if (hasContent) {
-      for (let i = updatedInner.length - 1; i >= 0; i -= 1) {
-        const ch = updatedInner[i];
-        if (ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r') continue;
-        if (ch !== ',') {
-          updatedInner += ',';
-        }
-        break;
-      }
-    }
-
-    const needsNewline = updatedInner && !updatedInner.endsWith('\n');
-    const insert = `${indent}${remoteLine},\n`;
-    const newInner = hasContent
-      ? `${updatedInner}${needsNewline ? '\n' : ''}${insert}`
-      : `\n${insert}`;
-    updatedConfigSource = `{${newInner}}`;
-  }
-
-  const updatedSource =
-    source.slice(0, range.start) +
-    updatedConfigSource +
-    source.slice(range.end + 1);
-  fs.writeFileSync(configFile, updatedSource);
-}
-
 function ensureRemotePath(configFile, { forceNew = false } = {}) {
   const existing = readRemotePathFromConfig(configFile);
   if (existing && !forceNew) return existing;

package/lib/config-utils.js

@@ -0,0 +1,259 @@
+/**
+ * File: /lib/config-utils.js
+ */
+
+import fs from 'fs';
+
+export function findConfigObjectRange(source) {
+  const match = source.match(/export\s+const\s+config\s*=/);
+  if (!match) return null;
+  const startSearch = match.index + match[0].length;
+  const braceStart = source.indexOf('{', startSearch);
+  if (braceStart === -1) return null;
+
+  return findObjectLiteralRange(source, braceStart);
+}
+
+function findObjectLiteralRange(source, braceStart) {
+  let depth = 0;
+  let inString = null;
+  let inLineComment = false;
+  let inBlockComment = false;
+  let escape = false;
+
+  for (let i = braceStart; i < source.length; i += 1) {
+    const ch = source[i];
+    const next = source[i + 1];
+
+    if (inLineComment) {
+      if (ch === '\n') inLineComment = false;
+      continue;
+    }
+
+    if (inBlockComment) {
+      if (ch === '*' && next === '/') {
+        inBlockComment = false;
+        i += 1;
+      }
+      continue;
+    }
+
+    if (inString) {
+      if (escape) {
+        escape = false;
+        continue;
+      }
+      if (ch === '\\') {
+        escape = true;
+        continue;
+      }
+      if (ch === inString) {
+        inString = null;
+      }
+      continue;
+    }
+
+    if (ch === '"' || ch === '\'' || ch === '`') {
+      inString = ch;
+      continue;
+    }
+
+    if (ch === '/' && next === '/') {
+      inLineComment = true;
+      i += 1;
+      continue;
+    }
+
+    if (ch === '/' && next === '*') {
+      inBlockComment = true;
+      i += 1;
+      continue;
+    }
+
+    if (ch === '{') {
+      depth += 1;
+    } else if (ch === '}') {
+      depth -= 1;
+      if (depth === 0) {
+        return { start: braceStart, end: i };
+      }
+    }
+  }
+
+  return null;
+}
+
+function detectIndent(inner) {
+  const indentMatch = inner.match(/\n([ \t]+)\S/);
+  return indentMatch ? indentMatch[1] : '  ';
+}
+
+function escapeRegExp(value) {
+  return String(value).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function isValidIdentifier(value) {
+  return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(value);
+}
+
+function formatObjectKey(value) {
+  if (isValidIdentifier(value)) return value;
+  return JSON.stringify(value);
+}
+
+function insertPropertyIntoObjectSource(objectSource, propertySource, indent) {
+  const inner = objectSource.slice(1, -1);
+  const trimmedInner = inner.replace(/\s*$/, '');
+  const hasContent = trimmedInner.trim().length > 0;
+  let updatedInner = trimmedInner;
+
+  if (hasContent) {
+    for (let i = updatedInner.length - 1; i >= 0; i -= 1) {
+      const ch = updatedInner[i];
+      if (ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r') continue;
+      if (ch !== ',') {
+        updatedInner += ',';
+      }
+      break;
+    }
+  }
+
+  const needsNewline = updatedInner && !updatedInner.endsWith('\n');
+  const insert = `${indent}${propertySource},\n`;
+  const newInner = hasContent
+    ? `${updatedInner}${needsNewline ? '\n' : ''}${insert}`
+    : `\n${insert}`;
+
+  return `{${newInner}}`;
+}
+
+export function readRemotePathFromConfig(configFile) {
+  const source = fs.readFileSync(configFile, 'utf-8');
+  const range = findConfigObjectRange(source);
+  if (!range) return null;
+  const configSource = source.slice(range.start, range.end + 1);
+  const match = configSource.match(/\bremotePath\s*:\s*(['"`])([^'"`]+)\1/);
+  return match ? match[2] : null;
+}
+
+export function writeRemotePathToConfig(configFile, remotePath) {
+  const source = fs.readFileSync(configFile, 'utf-8');
+  const range = findConfigObjectRange(source);
+  const remoteLine = `remotePath: ${JSON.stringify(remotePath)}`;
+
+  if (!range) {
+    const hasConfigExport = /export\s+const\s+config\s*=/.test(source);
+    if (hasConfigExport) {
+      throw new Error('Config export is not an object literal; add remotePath manually.');
+    }
+    const trimmed = source.replace(/\s*$/, '');
+    const appended = `${trimmed}\n\nexport const config = {\n  ${remoteLine}\n};\n`;
+    fs.writeFileSync(configFile, appended);
+    return;
+  }
+
+  const configSource = source.slice(range.start, range.end + 1);
+  const remoteRegex = /\bremotePath\s*:\s*(['"`])([^'"`]*?)\1/;
+  let updatedConfigSource;
+
+  if (remoteRegex.test(configSource)) {
+    updatedConfigSource = configSource.replace(remoteRegex, remoteLine);
+  } else {
+    const inner = configSource.slice(1, -1);
+    const indent = detectIndent(inner);
+    updatedConfigSource = insertPropertyIntoObjectSource(configSource, remoteLine, indent);
+  }
+
+  const updatedSource =
+    source.slice(0, range.start) +
+    updatedConfigSource +
+    source.slice(range.end + 1);
+  fs.writeFileSync(configFile, updatedSource);
+}
+
+function findModelsObjectRange(configSource) {
+  const regex = /\bmodels\s*:\s*{/g;
+  const match = regex.exec(configSource);
+  if (!match) return null;
+  const braceStart = configSource.indexOf('{', match.index + match[0].length - 1);
+  if (braceStart === -1) return null;
+  return findObjectLiteralRange(configSource, braceStart);
+}
+
+function buildModelKeyRegex(modelKey) {
+  const escaped = escapeRegExp(modelKey);
+  const quotedKey = `['"\\\`]${escaped}['"\\\`]`;
+  const unquotedKey = isValidIdentifier(modelKey) ? escaped : null;
+  const keyPattern = unquotedKey ? `(?:${unquotedKey}|${quotedKey})` : quotedKey;
+  return new RegExp(`(^|[,{\\s])(${keyPattern})\\s*:\\s*(['"\\\`])([^'"\\\\\`]*?)\\3`, 'm');
+}
+
+export function readModelFromConfig(configFile, modelKey) {
+  const source = fs.readFileSync(configFile, 'utf-8');
+  const range = findConfigObjectRange(source);
+  if (!range) return null;
+  const configSource = source.slice(range.start, range.end + 1);
+  const modelsRange = findModelsObjectRange(configSource);
+  if (!modelsRange) return null;
+  const modelsSource = configSource.slice(modelsRange.start, modelsRange.end + 1);
+  const keyRegex = buildModelKeyRegex(modelKey);
+  const match = modelsSource.match(keyRegex);
+  return match ? match[4] : null;
+}
+
+export function writeModelToConfig(configFile, modelKey, modelValue) {
+  const source = fs.readFileSync(configFile, 'utf-8');
+  const range = findConfigObjectRange(source);
+  const formattedKey = formatObjectKey(modelKey);
+  const serializedValue = JSON.stringify(modelValue);
+
+  if (!range) {
+    const hasConfigExport = /export\s+const\s+config\s*=/.test(source);
+    if (hasConfigExport) {
+      throw new Error('Config export is not an object literal; add models mapping manually.');
+    }
+    const trimmed = source.replace(/\s*$/, '');
+    const appended = `${trimmed}\n\nexport const config = {\n  models: {\n    ${formattedKey}: ${serializedValue}\n  }\n};\n`;
+    fs.writeFileSync(configFile, appended);
+    return;
+  }
+
+  const configSource = source.slice(range.start, range.end + 1);
+  const modelsRange = findModelsObjectRange(configSource);
+  let updatedConfigSource = configSource;
+
+  if (!modelsRange) {
+    const inner = configSource.slice(1, -1);
+    const indent = detectIndent(inner);
+    const nestedIndent = `${indent}  `;
+    const modelsBlock = `models: {\n${nestedIndent}${formattedKey}: ${serializedValue},\n${indent}}`;
+    updatedConfigSource = insertPropertyIntoObjectSource(configSource, modelsBlock, indent);
+  } else {
+    const modelsSource = configSource.slice(modelsRange.start, modelsRange.end + 1);
+    const keyRegex = buildModelKeyRegex(modelKey);
+    let updatedModelsSource;
+
+    if (keyRegex.test(modelsSource)) {
+      updatedModelsSource = modelsSource.replace(
+        keyRegex,
+        (_match, prefix, keyToken) => `${prefix}${keyToken}: ${serializedValue}`
+      );
+    } else {
+      const inner = modelsSource.slice(1, -1);
+      const indent = detectIndent(inner);
+      const modelLine = `${formattedKey}: ${serializedValue}`;
+      updatedModelsSource = insertPropertyIntoObjectSource(modelsSource, modelLine, indent);
+    }
+
+    updatedConfigSource =
+      configSource.slice(0, modelsRange.start) +
+      updatedModelsSource +
+      configSource.slice(modelsRange.end + 1);
+  }
+
+  const updatedSource =
+    source.slice(0, range.start) +
+    updatedConfigSource +
+    source.slice(range.end + 1);
+  fs.writeFileSync(configFile, updatedSource);
+}

package/lib/llm.js

@@ -7,6 +7,8 @@ import path from 'path';
 import os from 'os';
 import { spawn, execSync } from 'child_process';
 import { createRequire } from 'module';
+import { getCurrentRuntime } from './runtime/runtime.js';
+import { resolveUnknownModel } from './runtime/model-resolution.js';
 
 const require = createRequire(import.meta.url);
 
@@ -419,13 +421,29 @@ export async function llm(context, options) {
   const apiKeys = config.apiKeys || {};
   
   // Look up the model command/config
-  const modelConfig = models[options.model];
+  let modelConfig = models[options.model];
 
   if (!modelConfig) {
-    const available = Object.keys(models).join(', ');
-    throw new Error(
-      `Unknown model key: "${options.model}". Available models: ${available || 'none defined'}`
-    );
+    const runtime = getCurrentRuntime();
+    if (runtime) {
+      const workflowDir = options.workflowDir || config.workflowDir || runtime.workflowDir;
+      if (!workflowDir) {
+        throw new Error(`Unknown model key: "${options.model}". Workflow directory is missing.`);
+      }
+      modelConfig = await resolveUnknownModel(options.model, config, workflowDir, {
+        availableCLIs: detectAvailableCLIs()
+      });
+      if (!config.models) {
+        config.models = models;
+      }
+      config.models[options.model] = modelConfig;
+      runtime.workflowConfig.models[options.model] = modelConfig;
+    } else {
+      const available = Object.keys(models).join(', ');
+      throw new Error(
+        `Unknown model key: "${options.model}". Available models: ${available || 'none defined'}`
+      );
+    }
   }
 
   // Build the full prompt

package/lib/runtime/model-resolution.js

@@ -0,0 +1,128 @@
+/**
+ * File: /lib/runtime/model-resolution.js
+ */
+
+import fs from 'fs';
+import path from 'path';
+import { askHuman } from './prompt.js';
+import { createInteraction, parseInteractionResponse } from './interaction.js';
+import { readModelFromConfig, writeModelToConfig } from '../config-utils.js';
+
+function sanitizeSlug(value) {
+  return String(value)
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-+|-+$/g, '')
+    .substring(0, 40) || 'model';
+}
+
+export function buildModelSuggestions(availableCLIs = {}, existingModels = {}) {
+  const options = [];
+  const lookup = {};
+
+  const addOption = (key, label, description, value) => {
+    options.push({ key, label, description });
+    lookup[key] = value;
+  };
+
+  Object.entries(existingModels).forEach(([key, value]) => {
+    const optionKey = `existing:${key}`;
+    const description = value ? `Maps to "${value}"` : 'Existing model mapping';
+    addOption(optionKey, `Use existing model: ${key}`, description, value);
+  });
+
+  if (availableCLIs.claude) {
+    addOption('cli:claude', 'claude -p', 'Claude CLI (print mode)', 'claude -p');
+  }
+  if (availableCLIs.gemini) {
+    addOption('cli:gemini', 'gemini', 'Gemini CLI', 'gemini');
+  }
+  if (availableCLIs.codex) {
+    addOption('cli:codex', 'codex', 'Codex CLI (exec)', 'codex');
+  }
+  if (availableCLIs.ollama) {
+    addOption('cli:ollama', 'ollama run llama3.1', 'Ollama CLI (example model)', 'ollama run llama3.1');
+  }
+
+  addOption(
+    'api:openai',
+    'api:openai:gpt-4.1-mini',
+    'OpenAI API (example model)',
+    'api:openai:gpt-4.1-mini'
+  );
+  addOption(
+    'api:anthropic',
+    'api:anthropic:claude-3-5-sonnet-20241022',
+    'Anthropic API (example model)',
+    'api:anthropic:claude-3-5-sonnet-20241022'
+  );
+
+  return { options, lookup };
+}
+
+export async function promptForModelConfig(modelKey, existingModels = {}, availableCLIs = {}) {
+  const existingKeys = Object.keys(existingModels);
+  const existingSummary = existingKeys.length > 0
+    ? `Existing models: ${existingKeys.join(', ')}`
+    : 'No models configured yet.';
+
+  const { options, lookup } = buildModelSuggestions(availableCLIs, existingModels);
+  const prompt = `Unknown model key: "${modelKey}"\n\nHow would you like to configure this model?\n${existingSummary}`;
+  const slug = `model-${sanitizeSlug(modelKey)}`;
+  const interaction = createInteraction('choice', slug, {
+    prompt,
+    options,
+    allowCustom: true,
+    multiSelect: false
+  });
+
+  const answer = await askHuman(prompt, { slug, interaction });
+  const parsed = await parseInteractionResponse(interaction, answer);
+
+  if (parsed.isCustom && parsed.customText) {
+    return parsed.customText.trim();
+  }
+
+  if (parsed.selectedKey) {
+    const mapped = lookup[parsed.selectedKey];
+    if (mapped) return mapped;
+    return String(parsed.selectedKey).trim();
+  }
+
+  if (typeof parsed.text === 'string' && parsed.text.trim()) {
+    return parsed.text.trim();
+  }
+
+  if (typeof parsed.raw === 'string' && parsed.raw.trim()) {
+    return parsed.raw.trim();
+  }
+
+  throw new Error('No model configuration provided.');
+}
+
+export async function resolveUnknownModel(modelKey, config, workflowDir, options = {}) {
+  if (!workflowDir) {
+    throw new Error('Cannot resolve model without a workflow directory.');
+  }
+
+  const configFile = path.join(workflowDir, 'config.js');
+  if (!fs.existsSync(configFile)) {
+    throw new Error(`config.js not found in ${workflowDir}`);
+  }
+
+  const existing = readModelFromConfig(configFile, modelKey);
+  if (existing) {
+    return existing;
+  }
+
+  const existingModels = config?.models || {};
+  const availableCLIs = options.availableCLIs || {};
+  const modelValue = await promptForModelConfig(modelKey, existingModels, availableCLIs);
+
+  if (!modelValue) {
+    throw new Error('Model configuration cannot be empty.');
+  }
+
+  writeModelToConfig(configFile, modelKey, modelValue);
+  return modelValue;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-state-machine",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "type": "module",
   "description": "A workflow orchestrator for running agents and scripts in sequence with state management",
   "main": "lib/index.js",

package/templates/project-builder/agents/assumptions-clarifier.md

@@ -9,14 +9,6 @@ response: choice
 
 You are an assumptions and constraints analyst. Your job is to identify and validate assumptions before development.
 
-## Context
-Project Description: {{projectDescription}}
-Scope: {{scope}}
-Requirements: {{requirements}}
-{{#if previousResponse}}
-User's Previous Response: {{previousResponse}}
-{{/if}}
-
 ## Instructions
 
 Identify implicit assumptions that could impact the project. Consider:

package/templates/project-builder/agents/code-reviewer.md

@@ -7,14 +7,6 @@ format: json
 
 You are a senior code reviewer. Review implementations for quality, correctness, and best practices.
 
-## Context
-Task: {{task}}
-Implementation: {{implementation}}
-Test Plan: {{testPlan}}
-{{#if feedback}}
-Previous Feedback: {{feedback}}
-{{/if}}
-
 ## Instructions
 
 Perform a thorough code review covering:

package/templates/project-builder/agents/code-writer.md

@@ -7,16 +7,6 @@ format: json
 
 You are a senior software developer. Implement the task according to specifications.
 
-## Context
-Task: {{task}}
-Phase: {{phase}}
-Requirements: {{requirements}}
-Test Plan: {{testPlan}}
-Security Considerations: {{securityConsiderations}}
-{{#if feedback}}
-Previous Feedback (IMPORTANT - address these issues): {{feedback}}
-{{/if}}
-
 ## Instructions
 
 Implement the task following these principles:

package/templates/project-builder/agents/requirements-clarifier.md

@@ -9,13 +9,6 @@ response: choice
 
 You are a requirements analysis specialist. Your job is to gather and clarify functional and non-functional requirements.
 
-## Context
-Project Description: {{projectDescription}}
-Scope: {{scope}}
-{{#if previousResponse}}
-User's Previous Response: {{previousResponse}}
-{{/if}}
-
 ## Instructions
 
 Based on the project description and scope, identify requirements that need clarification. Consider:

package/templates/project-builder/agents/roadmap-generator.md

@@ -7,16 +7,6 @@ format: json
 
 You are a project planning specialist. Generate a phased development roadmap as structured JSON.
 
-## Context
-Project Description: {{projectDescription}}
-Scope: {{scope}}
-Requirements: {{requirements}}
-Assumptions: {{assumptions}}
-Security: {{security}}
-{{#if feedback}}
-User Feedback: {{feedback}}
-{{/if}}
-
 ## Instructions
 
 Create a phased roadmap as a JSON object. Each phase should:

package/templates/project-builder/agents/scope-clarifier.md

@@ -9,12 +9,6 @@ response: choice
 
 You are a project scope clarification specialist. Your job is to ensure the project scope is well-defined before development begins.
 
-## Context
-Project Description: {{projectDescription}}
-{{#if previousResponse}}
-User's Previous Response: {{previousResponse}}
-{{/if}}
-
 ## Instructions
 
 Analyze the project description and determine if the scope is clear. Consider: