@fargowealth/fargo-ai-cli 0.7.3 → 1.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.8.0
+
+- Replaced regex-based D1 migration checks with token-structured parsing that
+  handles comments, literals, identifiers, parentheses, and statement shape.
+- Require `--table-prefix` for every schema and controlled data migration plan
+  and apply; table names, index names, index targets, and foreign-key references
+  must all remain under that App prefix.
+- Preserve the separate approval requirement for controlled data mutations;
+  the hosted service independently derives and verifies the authoritative App
+  prefix before executing the migration as an atomic D1 batch.
+
 ## 0.7.3
 
 - Added one-command Agent installation through `fargo agent install --agent`

package/README.md

@@ -9,7 +9,7 @@ Requires Node.js 20.19 or newer.
 ## Install or upgrade
 
 ```sh
-npm install -g @fargowealth/fargo-ai-cli@0.7.3
+npm install -g @fargowealth/fargo-ai-cli@latest
 fargo version
 ```
 
@@ -43,8 +43,8 @@ reused by both MCP and local CLI operations.
 
 ```sh
 fargo mcp tools
-fargo mcp call lego_get_app --args '{"appId":"app_xxx"}'
-fargo mcp call lego_get_app --args-file ./arguments.json
+fargo mcp call lego_app_read --args '{"action":"get","appId":"app_xxx"}'
+fargo mcp call lego_app_read --args-file ./arguments.json
 ```
 
 ## LEGO source snapshots
@@ -146,9 +146,9 @@ Deployment artifacts preserve binary bytes and include
 ## LEGO D1 migrations
 
 ```sh
-# Schema-only migrations keep the existing flow
-fargo lego d1 migrate plan --app app_xxx --dir migrations
-fargo lego d1 migrate apply --app app_xxx --dir migrations
+# Schema-only migrations also require the authoritative local prefix assertion
+fargo lego d1 migrate plan --app app_xxx --dir migrations --table-prefix app_code_
+fargo lego d1 migrate apply --app app_xxx --dir migrations --table-prefix app_code_
 
 # Controlled data migrations: review the reported impact first
 fargo lego d1 migrate plan \
@@ -170,13 +170,15 @@ production registry; `apply` stops on content drift and submits only pending
 files. The plan reports statement types, data-mutation types, target tables,
 and whether separate data-migration approval is required.
 
-Schema DDL remains the default. The opt-in data mode accepts `INSERT ... VALUES`
-with optional `ON CONFLICT`, plus `UPDATE` and `DELETE` only when they contain a
-`WHERE` clause. Data targets must use the server-derived App table prefix;
+Schema DDL remains the default. Every migration command requires
+`--table-prefix`; the token parser applies it to table names, index names, index
+targets, and foreign-key references before MCP is contacted. The opt-in data
+mode accepts `INSERT ... VALUES` with optional `ON CONFLICT`, plus `UPDATE` and
+`DELETE` only when they contain a `WHERE` clause. Data targets must use the server-derived App table prefix;
 system tables, cross-table queries, `PRAGMA`, `ATTACH`, and `DROP` remain
-blocked. `--table-prefix` is a local assertion and the service rejects it if it
-does not match the App's authoritative prefix. Migration execution remains
-server-side and is never coupled to deploy.
+blocked. The service independently derives the authoritative prefix and rejects
+a mismatched client assertion. Each migration file executes as one transactional
+D1 batch, server-side and independently from deploy.
 
 ## Compatibility and repair
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fargowealth/fargo-ai-cli",
-  "version": "0.7.3",
+  "version": "1.0.0",
   "description": "Agent-neutral Fargo AI CLI, MCP client, and LEGO project tooling",
   "type": "module",
   "bin": {

package/src/agent-install.mjs

@@ -7,14 +7,15 @@ import { normalizeAgentType } from "./auth.mjs";
 import { CLI_VERSION } from "./constants.mjs";
 
 const PACKAGE_NAME = "@fargowealth/fargo-ai-cli";
-const SERVER_NAME = "fargo-ai";
+const SERVER_NAME = "fargo-pass";
+const LEGACY_SERVER_NAME = "fargo-ai";
 
 export async function installAgentMcp(rawAgent, options = {}) {
   const agent = normalizeAgentType(rawAgent);
   const platform = options.platform ?? process.platform;
   const env = options.env ?? process.env;
   const homeDirectory = options.home ?? homedir();
-  const packageSpec = `${PACKAGE_NAME}@${options.packageVersion ?? CLI_VERSION}`;
+  const packageSpec = `${PACKAGE_NAME}@${options.packageVersion ?? "latest"}`;
   const npxCommand = options.npxCommand ?? (platform === "darwin"
     ? await resolveNpxCommand({ env, execPath: options.execPath, platform })
     : "npx");
@@ -96,10 +97,14 @@ async function installJsonMcp(agent, server, options) {
     env: server.env
   };
   const previousServer = config.mcpServers?.[SERVER_NAME];
-  const changed = JSON.stringify(previousServer) !== JSON.stringify(nextServer);
+  const hadLegacyServer = Boolean(config.mcpServers?.[LEGACY_SERVER_NAME]);
+  const changed = hadLegacyServer || JSON.stringify(previousServer) !== JSON.stringify(nextServer);
 
   if (changed) {
-    config.mcpServers = { ...(config.mcpServers ?? {}), [SERVER_NAME]: nextServer };
+    const nextServers = { ...(config.mcpServers ?? {}) };
+    delete nextServers[LEGACY_SERVER_NAME];
+    nextServers[SERVER_NAME] = nextServer;
+    config.mcpServers = nextServers;
     await writeConfig(options.configPath, config);
   }
 
@@ -114,9 +119,12 @@ async function installHostCliMcp(agent, server, options) {
   const removeArgs = agent === "codex"
     ? ["mcp", "remove", SERVER_NAME]
     : ["mcp", "remove", "--scope", "user", SERVER_NAME];
-  const removeResult = await runHostCommand(command, removeArgs, options);
-  if (removeResult.exitCode !== 0 && !isMissingServer(removeResult)) {
-    throw new Error(`${agentLabel(agent)} could not replace the existing ${SERVER_NAME} MCP entry: ${commandError(removeResult)}`);
+  for (const candidate of [SERVER_NAME, LEGACY_SERVER_NAME]) {
+    const candidateRemoveArgs = removeArgs.map((value) => value === SERVER_NAME ? candidate : value);
+    const removeResult = await runHostCommand(command, candidateRemoveArgs, options);
+    if (removeResult.exitCode !== 0 && !isMissingServer(removeResult)) {
+      throw new Error(`${agentLabel(agent)} could not replace the existing ${candidate} MCP entry: ${commandError(removeResult)}`);
+    }
   }
 
   const environmentArgs = Object.entries(server.env).flatMap(([key, value]) => agent === "codex"
@@ -181,7 +189,7 @@ function installationResult(agent, packageSpec, changed, extra) {
     package: packageSpec,
     ...extra,
     next_action: agent === "workbuddy"
-      ? "Open WorkBuddy Custom Connectors, trust and enable fargo-ai, then start a new task."
+      ? "Open WorkBuddy Custom Connectors, trust and enable fargo-pass, then start a new task."
       : `Restart ${agentLabel(agent)} or start a new Agent session, then call ping_who_am_i.`
   };
 }

package/src/cli.mjs

@@ -112,7 +112,7 @@ export async function runCli(args, options = {}) {
         stdout.write(`${JSON.stringify(await applyLegoMigrations(store, input, options))}\n`);
         return;
       }
-      throw new Error("Usage: fargo lego d1 migrate plan|apply --app <appId> [--dir migrations] [--table-prefix app_prefix_] [--allow-data-migrations]");
+      throw new Error("Usage: fargo lego d1 migrate plan|apply --app <appId> --table-prefix <app_prefix_> [--dir migrations] [--allow-data-migrations]");
     }
     if (args[0] === "agent" && args[1] === "install") {
       await installAgentConnection(args, requiredOption(args, "--agent"), stdout, store, options);

package/src/constants.mjs

@@ -1,4 +1,4 @@
-export const CLI_VERSION = "0.7.3";
+export const CLI_VERSION = "1.0.0";
 export const DEVICE_CODE_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
 export const DEFAULT_AUTH_URL = "https://auth.fargowealth.app";
 export const DEFAULT_API_URL = "https://mcp.fargowealth.app";

package/src/lego-deploy.mjs

@@ -60,8 +60,8 @@ export async function deployLocalLegoApp(store, input, options = {}) {
   const deployArtifactId = uploadedArtifact.deployArtifact?.id;
   if (!deployArtifactId) throw new Error("Deployment artifact upload did not return deployArtifact.id");
 
-  const tool = target === "pages" ? "lego_pages_deploy" : "lego_worker_deploy";
   const deploymentInput = {
+    action: target,
     appId: input.appId,
     deployArtifactId,
     entrypoint: artifact.entrypoint,
@@ -70,7 +70,7 @@ export async function deployLocalLegoApp(store, input, options = {}) {
     versionName: input.versionName,
     ...(sourceSnapshotId ? { sourceSnapshotId } : {})
   };
-  const deployment = mcpToolPayload(await callMcpTool(store, tool, deploymentInput, options));
+  const deployment = mcpToolPayload(await callMcpTool(store, "lego_deploy_prepare", deploymentInput, options));
 
   return {
     appId: input.appId,

package/src/lego-migrations.mjs

@@ -3,6 +3,7 @@ import { lstat, opendir, readFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
 import { callMcpTool } from "./mcp-client.mjs";
 import { mcpToolPayload } from "./mcp-result.mjs";
+import { analyzeMigrationStatement, parseMigrationStatements } from "./migration-sql.mjs";
 
 const MAX_MIGRATION_BYTES = 80_000;
 const MAX_MIGRATION_FILES = 500;
@@ -13,7 +14,7 @@ export async function planLegoMigrations(store, input, options = {}) {
 
 async function buildMigrationPlan(store, input, options) {
   const local = await readMigrationDirectory(input.directory, { tablePrefix: input.tablePrefix });
-  const remote = mcpToolPayload(await callMcpTool(store, "lego_d1_migrations_list", { appId: input.appId }, options));
+  const remote = mcpToolPayload(await callMcpTool(store, "lego_database", { action: "migrations_list", appId: input.appId }, options));
   const applied = new Map((remote.migrations ?? []).map((migration) => [String(migration.version), migration]));
   const migrations = local.map((migration) => {
     const existing = applied.get(migration.version);
@@ -61,7 +62,8 @@ export async function applyLegoMigrations(store, input, options = {}) {
 
   const applied = [];
   for (const migration of plan.migrations.filter((item) => item.status === "pending")) {
-    const result = mcpToolPayload(await callMcpTool(store, "lego_d1_migrations_apply", {
+    const result = mcpToolPayload(await callMcpTool(store, "lego_database", {
+      action: "migration_apply",
       appId: input.appId,
       allowDataMigrations: migration.impact.dataStatementCount > 0 && input.allowDataMigrations === true,
       contentSha256: migration.contentSha256,
@@ -163,166 +165,3 @@ export function analyzeLegoMigrationSql(sql, fileName = "migration.sql", options
 }
 
 export const validateLegoMigrationSql = analyzeLegoMigrationSql;
-
-function parseMigrationStatements(sql) {
-  const statements = [];
-  let current = "";
-  let quote;
-  let blockComment = false;
-  let lineComment = false;
-
-  for (let index = 0; index < sql.length; index += 1) {
-    const char = sql[index];
-    const next = sql[index + 1];
-    if (blockComment) {
-      if (char === "*" && next === "/") {
-        blockComment = false;
-        index += 1;
-      }
-      continue;
-    }
-    if (lineComment) {
-      if (char === "\n") lineComment = false;
-      continue;
-    }
-    if (!quote && char === "/" && next === "*") {
-      blockComment = true;
-      current += " ";
-      index += 1;
-      continue;
-    }
-    if (!quote && char === "-" && next === "-") {
-      lineComment = true;
-      current += " ";
-      index += 1;
-      continue;
-    }
-    if ((char === "'" || char === '"') && sql[index - 1] !== "\\") {
-      quote = quote === char ? undefined : quote ?? char;
-    }
-    if (!quote && char === ";") {
-      const statement = current.trim();
-      if (statement) statements.push(statement);
-      current = "";
-      continue;
-    }
-    current += char;
-  }
-  if (blockComment) throw new Error("Migration SQL contains an unterminated block comment");
-
-  const trailing = current.trim();
-  if (trailing) statements.push(trailing);
-  return statements;
-}
-
-function analyzeMigrationStatement(statement, options = {}) {
-  const normalized = statement.replace(/\s+/g, " ").trim();
-  const createTable = normalized.match(/^CREATE\s+TABLE\s+IF\s+NOT\s+EXISTS\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*\(/i);
-  if (createTable?.[1]) {
-    assertMigrationIdentifier(createTable[1]);
-    assertOwnedReferences(normalized, options.tablePrefix);
-    return { category: "schema", table: createTable[1], type: "create_table" };
-  }
-
-  const createIndex = normalized.match(/^CREATE\s+INDEX\s+IF\s+NOT\s+EXISTS\s+([a-zA-Z_][a-zA-Z0-9_]*)\s+ON\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*\(/i);
-  if (createIndex?.[1] && createIndex[2]) {
-    assertMigrationIdentifier(createIndex[1]);
-    assertMigrationIdentifier(createIndex[2]);
-    return { category: "schema", table: createIndex[2], type: "create_index" };
-  }
-
-  const alterTable = normalized.match(/^ALTER\s+TABLE\s+([a-zA-Z_][a-zA-Z0-9_]*)\s+ADD\s+COLUMN\s+([a-zA-Z_][a-zA-Z0-9_]*)\b/i);
-  if (alterTable?.[1]) {
-    assertMigrationIdentifier(alterTable[1]);
-    assertOwnedReferences(normalized, options.tablePrefix);
-    return { category: "schema", table: alterTable[1], type: "alter_table" };
-  }
-
-  const structure = stripQuotedSql(normalized);
-  if (/^(?:INSERT\s+INTO|UPDATE|DELETE\s+FROM)\s+[a-zA-Z_][a-zA-Z0-9_]*\s*\./i.test(structure)) {
-    throw new Error("Data migrations cannot use qualified table names");
-  }
-  const insert = structure.match(/^INSERT\s+INTO\s+([a-zA-Z_][a-zA-Z0-9_]*)\b/i);
-  if (insert?.[1]) {
-    assertOwnedDataTable(insert[1], options.tablePrefix);
-    assertNoCrossResourceDataQuery(structure, "insert");
-    if (!/\bVALUES\s*\(/i.test(structure)) throw new Error("INSERT data migrations must use VALUES");
-    if (/\bON\s+CONFLICT\b/i.test(structure) && !/\bDO\s+(?:NOTHING|UPDATE\s+SET)\b/i.test(structure)) {
-      throw new Error("INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
-    }
-    return { category: "data", table: insert[1], type: "insert" };
-  }
-
-  const update = structure.match(/^UPDATE\s+([a-zA-Z_][a-zA-Z0-9_]*)\s+SET\s+/i);
-  if (update?.[1]) {
-    assertOwnedDataTable(update[1], options.tablePrefix);
-    if (!/\bWHERE\b/i.test(structure)) throw new Error("UPDATE data migrations must include WHERE");
-    assertNoCrossResourceDataQuery(structure, "update");
-    return { category: "data", table: update[1], type: "update" };
-  }
-
-  const deleteFrom = structure.match(/^DELETE\s+FROM\s+([a-zA-Z_][a-zA-Z0-9_]*)\b/i);
-  if (deleteFrom?.[1]) {
-    assertOwnedDataTable(deleteFrom[1], options.tablePrefix);
-    if (!/\bWHERE\b/i.test(structure)) throw new Error("DELETE data migrations must include WHERE");
-    assertNoCrossResourceDataQuery(structure, "delete");
-    return { category: "data", table: deleteFrom[1], type: "delete" };
-  }
-  throw new Error("Statement type is not allowed");
-}
-
-function assertMigrationIdentifier(identifier) {
-  if (identifier.toLowerCase().startsWith("sqlite_")) {
-    throw new Error("reserved_migration_identifier");
-  }
-}
-
-function assertOwnedDataTable(identifier, tablePrefix) {
-  assertMigrationIdentifier(identifier);
-  const prefix = String(tablePrefix ?? "").trim().toLowerCase();
-  if (prefix && !identifier.toLowerCase().startsWith(prefix)) {
-    throw new Error(`Data table ${identifier} is outside App prefix ${prefix}`);
-  }
-}
-
-function assertOwnedReferences(statement, tablePrefix) {
-  for (const match of statement.matchAll(/\bREFERENCES\s+([a-zA-Z_][a-zA-Z0-9_]*)\b/gi)) {
-    if (match[1]) assertOwnedDataTable(match[1], tablePrefix);
-  }
-}
-
-function assertNoCrossResourceDataQuery(statement, kind) {
-  const forbidden = kind === "delete"
-    ? /\b(?:SELECT|WITH|JOIN|ATTACH|DETACH|PRAGMA|DROP)\b/i
-    : /\b(?:SELECT|WITH|JOIN|FROM|ATTACH|DETACH|PRAGMA|DROP)\b/i;
-  if (forbidden.test(statement)) {
-    throw new Error("Data migrations cannot query other tables or use administrative SQL");
-  }
-}
-
-function stripQuotedSql(value) {
-  let result = "";
-  let quote;
-  for (let index = 0; index < value.length; index += 1) {
-    const char = value[index];
-    if (quote) {
-      if (char === quote) {
-        if (value[index + 1] === quote) {
-          result += "  ";
-          index += 1;
-          continue;
-        }
-        quote = undefined;
-      }
-      result += " ";
-      continue;
-    }
-    if (char === "'" || char === '"') {
-      quote = char;
-      result += " ";
-      continue;
-    }
-    result += char;
-  }
-  return result;
-}

package/src/migration-sql.mjs

@@ -0,0 +1,476 @@
+const ADMINISTRATIVE_KEYWORDS = new Set([
+  "ANALYZE",
+  "ATTACH",
+  "DETACH",
+  "DROP",
+  "PRAGMA",
+  "REINDEX",
+  "VACUUM"
+]);
+const CROSS_TABLE_QUERY_KEYWORDS = new Set(["JOIN", "SELECT", "WITH"]);
+const ALTER_DEFINITION_STATEMENT_KEYWORDS = new Set(["ALTER", "CREATE", "DELETE", "INSERT", "UPDATE"]);
+
+export function parseMigrationStatements(sql) {
+  const statements = [];
+  let current = "";
+  let quote;
+  let bracketIdentifier = false;
+  let blockComment = false;
+  let lineComment = false;
+
+  for (let index = 0; index < sql.length; index += 1) {
+    const char = sql[index];
+    const next = sql[index + 1];
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (lineComment) {
+      if (char === "\n") {
+        lineComment = false;
+        current += "\n";
+      }
+      continue;
+    }
+    if (!quote && !bracketIdentifier && char === "/" && next === "*") {
+      blockComment = true;
+      current += " ";
+      index += 1;
+      continue;
+    }
+    if (!quote && !bracketIdentifier && char === "-" && next === "-") {
+      lineComment = true;
+      current += " ";
+      index += 1;
+      continue;
+    }
+    if (!quote && char === "[") {
+      bracketIdentifier = true;
+    } else if (bracketIdentifier && char === "]") {
+      bracketIdentifier = false;
+    } else if (!bracketIdentifier && (char === "'" || char === "\"" || char === "`")) {
+      if (quote === char && next === char) {
+        current += char + next;
+        index += 1;
+        continue;
+      }
+      quote = quote === char ? undefined : quote ?? char;
+    }
+    if (!quote && !bracketIdentifier && char === ";") {
+      const statement = current.trim();
+      if (statement) statements.push(statement);
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+
+  if (blockComment) throw new Error("Migration SQL contains an unterminated block comment");
+  if (quote || bracketIdentifier) throw new Error("Migration SQL contains an unterminated literal or identifier");
+  const trailing = current.trim();
+  if (trailing) statements.push(trailing);
+  return statements;
+}
+
+export function analyzeMigrationStatement(statement, options = {}) {
+  const tablePrefix = normalizeRequiredPrefix(options.tablePrefix);
+  const tokens = tokenizeSql(statement);
+  if (tokens.length === 0) throw new Error("Statement type is not allowed");
+  rejectAdministrativeKeywords(tokens);
+
+  if (isKeyword(tokens[0], "CREATE")) return validateCreate(tokens, tablePrefix);
+  if (isKeyword(tokens[0], "ALTER")) return validateAlterTable(tokens, tablePrefix);
+  if (isKeyword(tokens[0], "INSERT")) return validateInsert(tokens, tablePrefix);
+  if (isKeyword(tokens[0], "UPDATE")) return validateUpdate(tokens, tablePrefix);
+  if (isKeyword(tokens[0], "DELETE")) return validateDelete(tokens, tablePrefix);
+  throw new Error("Statement type is not allowed");
+}
+
+function validateCreate(tokens, tablePrefix) {
+  const cursor = new TokenCursor(tokens);
+  cursor.expectKeyword("CREATE");
+  if (cursor.matchKeyword("TABLE")) {
+    cursor.expectKeyword("IF");
+    cursor.expectKeyword("NOT");
+    cursor.expectKeyword("EXISTS");
+    const table = cursor.readIdentifier();
+    assertOwnedMigrationIdentifier(table, tablePrefix);
+    cursor.expectSymbol("(");
+    const closing = matchingParenIndex(tokens, cursor.position - 1);
+    if (closing !== tokens.length - 1 || closing === cursor.position) throw unsupportedStatement();
+    const definition = tokens.slice(cursor.position, closing);
+    assertOwnedReferences(definition, tablePrefix);
+    assertNoQueryKeywords(definition);
+    return { category: "schema", table, type: "create_table" };
+  }
+  if (cursor.matchKeyword("INDEX")) {
+    cursor.expectKeyword("IF");
+    cursor.expectKeyword("NOT");
+    cursor.expectKeyword("EXISTS");
+    const indexName = cursor.readIdentifier();
+    assertOwnedMigrationIdentifier(indexName, tablePrefix);
+    cursor.expectKeyword("ON");
+    const table = cursor.readIdentifier();
+    assertOwnedMigrationIdentifier(table, tablePrefix);
+    cursor.expectSymbol("(");
+    const closing = matchingParenIndex(tokens, cursor.position - 1);
+    if (closing === cursor.position) throw unsupportedStatement();
+    const trailing = tokens.slice(closing + 1);
+    if (trailing.length > 0 && (!isKeyword(trailing[0], "WHERE") || trailing.length === 1)) {
+      throw unsupportedStatement();
+    }
+    assertNoQueryKeywords(tokens.slice(cursor.position, closing));
+    assertNoQueryKeywords(trailing);
+    return { category: "schema", table, type: "create_index" };
+  }
+  throw unsupportedStatement();
+}
+
+function validateAlterTable(tokens, tablePrefix) {
+  const cursor = new TokenCursor(tokens);
+  cursor.expectKeyword("ALTER");
+  cursor.expectKeyword("TABLE");
+  const table = cursor.readIdentifier();
+  assertOwnedMigrationIdentifier(table, tablePrefix);
+  cursor.expectKeyword("ADD");
+  cursor.expectKeyword("COLUMN");
+  cursor.readIdentifier();
+  if (cursor.done()) throw unsupportedStatement();
+  const definition = tokens.slice(cursor.position);
+  assertOwnedReferences(definition, tablePrefix);
+  assertNoQueryKeywords(definition);
+  if (definition.some((token) => token.kind === "word" && ALTER_DEFINITION_STATEMENT_KEYWORDS.has(token.upper))) {
+    throw unsupportedStatement();
+  }
+  return { category: "schema", table, type: "alter_table" };
+}
+
+function validateInsert(tokens, tablePrefix) {
+  const cursor = new TokenCursor(tokens);
+  cursor.expectKeyword("INSERT");
+  cursor.expectKeyword("INTO");
+  const table = cursor.readIdentifier();
+  assertOwnedMigrationIdentifier(table, tablePrefix);
+  rejectQualifiedTarget(cursor);
+  assertNoDataQueryKeywords(tokens.slice(cursor.position));
+  if (cursor.peekSymbol("(")) cursor.skipBalancedGroup();
+  cursor.expectKeyword("VALUES", "INSERT data migrations must use VALUES");
+  if (!cursor.peekSymbol("(")) throw new Error("INSERT data migrations must use VALUES");
+  cursor.skipBalancedGroup();
+  while (cursor.matchSymbol(",")) {
+    if (!cursor.peekSymbol("(")) throw new Error("INSERT data migrations must use VALUES");
+    cursor.skipBalancedGroup();
+  }
+  if (cursor.done()) return { category: "data", table, type: "insert" };
+  cursor.expectKeyword("ON", "INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+  cursor.expectKeyword("CONFLICT", "INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+  if (cursor.peekSymbol("(")) cursor.skipBalancedGroup();
+  if (cursor.matchKeyword("WHERE")) {
+    const doIndex = findTopLevelKeyword(tokens, "DO", cursor.position);
+    if (doIndex <= cursor.position) throw new Error("INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+    cursor.position = doIndex;
+  }
+  cursor.expectKeyword("DO", "INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+  if (cursor.matchKeyword("NOTHING")) {
+    if (!cursor.done()) throw new Error("INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+    return { category: "data", table, type: "insert" };
+  }
+  cursor.expectKeyword("UPDATE", "INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+  cursor.expectKeyword("SET", "INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+  if (cursor.done()) throw new Error("INSERT ON CONFLICT must use DO NOTHING or DO UPDATE SET");
+  return { category: "data", table, type: "insert" };
+}
+
+function validateUpdate(tokens, tablePrefix) {
+  const cursor = new TokenCursor(tokens);
+  cursor.expectKeyword("UPDATE");
+  const table = cursor.readIdentifier();
+  assertOwnedMigrationIdentifier(table, tablePrefix);
+  rejectQualifiedTarget(cursor);
+  cursor.expectKeyword("SET");
+  assertNoDataQueryKeywords(tokens.slice(cursor.position));
+  const whereIndex = findTopLevelKeyword(tokens, "WHERE", cursor.position);
+  if (whereIndex < 0 || whereIndex === tokens.length - 1) throw new Error("UPDATE data migrations must include WHERE");
+  if (whereIndex === cursor.position) throw unsupportedStatement();
+  return { category: "data", table, type: "update" };
+}
+
+function validateDelete(tokens, tablePrefix) {
+  const cursor = new TokenCursor(tokens);
+  cursor.expectKeyword("DELETE");
+  cursor.expectKeyword("FROM");
+  const table = cursor.readIdentifier();
+  assertOwnedMigrationIdentifier(table, tablePrefix);
+  rejectQualifiedTarget(cursor);
+  assertNoDataQueryKeywords(tokens.slice(cursor.position));
+  const whereIndex = findTopLevelKeyword(tokens, "WHERE", cursor.position);
+  if (whereIndex < 0 || whereIndex === tokens.length - 1) throw new Error("DELETE data migrations must include WHERE");
+  if (whereIndex !== cursor.position) throw unsupportedStatement();
+  return { category: "data", table, type: "delete" };
+}
+
+function tokenizeSql(statement) {
+  const tokens = [];
+  for (let index = 0; index < statement.length;) {
+    const char = statement[index];
+    if (isWhitespace(char)) {
+      index += 1;
+      continue;
+    }
+    if (isIdentifierStart(char)) {
+      const start = index;
+      index += 1;
+      while (index < statement.length && isIdentifierPart(statement[index])) index += 1;
+      const text = statement.slice(start, index);
+      tokens.push({ kind: "word", text, upper: text.toUpperCase() });
+      continue;
+    }
+    if (isDigit(char) || (char === "." && isDigit(statement[index + 1]))) {
+      const end = readNumberEnd(statement, index);
+      tokens.push({ kind: "number", text: statement.slice(index, end) });
+      index = end;
+      continue;
+    }
+    if (char === "'") {
+      const start = index;
+      index += 1;
+      let terminated = false;
+      while (index < statement.length) {
+        if (statement[index] === "'" && statement[index + 1] === "'") {
+          index += 2;
+          continue;
+        }
+        if (statement[index] === "'") {
+          index += 1;
+          terminated = true;
+          break;
+        }
+        index += 1;
+      }
+      if (!terminated) throw new Error("Migration SQL contains an unterminated literal");
+      tokens.push({ kind: "string", text: statement.slice(start, index) });
+      continue;
+    }
+    if (char === "\"" || char === "`" || char === "[") {
+      throw new Error("Quoted migration identifiers are not allowed");
+    }
+    if (isSymbolStart(char)) {
+      const pair = statement.slice(index, index + 2);
+      const symbol = isTwoCharacterSymbol(pair) ? pair : char;
+      tokens.push({ kind: "symbol", text: symbol });
+      index += symbol.length;
+      continue;
+    }
+    throw new Error("Migration SQL contains an unsupported token");
+  }
+  assertBalancedParentheses(tokens);
+  return tokens;
+}
+
+class TokenCursor {
+  position = 0;
+
+  constructor(tokens) {
+    this.tokens = tokens;
+  }
+
+  done() {
+    return this.position >= this.tokens.length;
+  }
+
+  expectKeyword(keyword, message = "Statement type is not allowed") {
+    if (!this.matchKeyword(keyword)) throw new Error(message);
+  }
+
+  expectSymbol(symbol) {
+    if (!this.matchSymbol(symbol)) throw unsupportedStatement();
+  }
+
+  matchKeyword(keyword) {
+    if (!isKeyword(this.tokens[this.position], keyword)) return false;
+    this.position += 1;
+    return true;
+  }
+
+  matchSymbol(symbol) {
+    if (!this.peekSymbol(symbol)) return false;
+    this.position += 1;
+    return true;
+  }
+
+  peekSymbol(symbol) {
+    const token = this.tokens[this.position];
+    return token?.kind === "symbol" && token.text === symbol;
+  }
+
+  readIdentifier() {
+    const token = this.tokens[this.position];
+    if (token?.kind !== "word") throw unsupportedStatement();
+    this.position += 1;
+    return token.text;
+  }
+
+  skipBalancedGroup() {
+    if (!this.peekSymbol("(")) throw unsupportedStatement();
+    this.position = matchingParenIndex(this.tokens, this.position) + 1;
+  }
+}
+
+function normalizeRequiredPrefix(value) {
+  const prefix = String(value ?? "").trim().toLowerCase();
+  if (!prefix) throw new Error("App D1 migration preflight requires --table-prefix");
+  return prefix;
+}
+
+function assertOwnedMigrationIdentifier(identifier, tablePrefix) {
+  const normalized = identifier.toLowerCase();
+  if (normalized.startsWith("sqlite_")) throw new Error("reserved_migration_identifier");
+  if (!normalized.startsWith(tablePrefix)) {
+    throw new Error(`Migration identifier ${identifier} is outside App prefix ${tablePrefix}`);
+  }
+}
+
+function assertOwnedReferences(tokens, tablePrefix) {
+  for (let index = 0; index < tokens.length; index += 1) {
+    if (!isKeyword(tokens[index], "REFERENCES")) continue;
+    const referenced = tokens[index + 1];
+    if (referenced?.kind !== "word") throw unsupportedStatement();
+    assertOwnedMigrationIdentifier(referenced.text, tablePrefix);
+    if (tokens[index + 2]?.kind === "symbol" && tokens[index + 2]?.text === ".") {
+      throw new Error("Data migrations cannot query other tables or use administrative SQL");
+    }
+  }
+}
+
+function rejectQualifiedTarget(cursor) {
+  if (cursor.peekSymbol(".")) throw new Error("Data migrations cannot use qualified table names");
+}
+
+function rejectAdministrativeKeywords(tokens) {
+  if (tokens.some((token) => token.kind === "word" && ADMINISTRATIVE_KEYWORDS.has(token.upper))) {
+    throw unsupportedStatement();
+  }
+}
+
+function assertNoQueryKeywords(tokens) {
+  if (tokens.some((token) => token.kind === "word" && CROSS_TABLE_QUERY_KEYWORDS.has(token.upper))) {
+    throw new Error("Migrations cannot query other tables");
+  }
+}
+
+function assertNoDataQueryKeywords(tokens) {
+  if (tokens.some((token) => token.kind === "word" && (token.upper === "FROM" || CROSS_TABLE_QUERY_KEYWORDS.has(token.upper)))) {
+    throw new Error("Data migrations cannot query other tables or use administrative SQL");
+  }
+}
+
+function assertBalancedParentheses(tokens) {
+  let depth = 0;
+  for (const token of tokens) {
+    if (token.kind !== "symbol") continue;
+    if (token.text === "(") depth += 1;
+    if (token.text === ")") depth -= 1;
+    if (depth < 0) throw new Error("Migration SQL contains unbalanced parentheses");
+  }
+  if (depth !== 0) throw new Error("Migration SQL contains unbalanced parentheses");
+}
+
+function matchingParenIndex(tokens, openingIndex) {
+  if (tokens[openingIndex]?.kind !== "symbol" || tokens[openingIndex]?.text !== "(") throw unsupportedStatement();
+  let depth = 0;
+  for (let index = openingIndex; index < tokens.length; index += 1) {
+    const token = tokens[index];
+    if (token.kind !== "symbol") continue;
+    if (token.text === "(") depth += 1;
+    if (token.text === ")") depth -= 1;
+    if (depth === 0) return index;
+  }
+  throw new Error("Migration SQL contains unbalanced parentheses");
+}
+
+function findTopLevelKeyword(tokens, keyword, start) {
+  let depth = 0;
+  for (let index = start; index < tokens.length; index += 1) {
+    const token = tokens[index];
+    if (token.kind === "symbol" && token.text === "(") {
+      depth += 1;
+      continue;
+    }
+    if (token.kind === "symbol" && token.text === ")") {
+      depth -= 1;
+      continue;
+    }
+    if (depth === 0 && isKeyword(token, keyword)) return index;
+  }
+  return -1;
+}
+
+function readNumberEnd(value, start) {
+  let index = start;
+  if (value[index] === "0" && (value[index + 1] === "x" || value[index + 1] === "X") && isHexDigit(value[index + 2])) {
+    index += 3;
+    while (isHexDigit(value[index])) index += 1;
+    return index;
+  }
+  if (value[index] === ".") index += 1;
+  while (isDigit(value[index])) index += 1;
+  if (value[index] === ".") {
+    index += 1;
+    while (isDigit(value[index])) index += 1;
+  }
+  if (value[index] === "e" || value[index] === "E") {
+    let exponent = index + 1;
+    if (value[exponent] === "+" || value[exponent] === "-") exponent += 1;
+    if (isDigit(value[exponent])) {
+      index = exponent + 1;
+      while (isDigit(value[index])) index += 1;
+    }
+  }
+  return index;
+}
+
+function isIdentifierStart(char) {
+  if (!char) return false;
+  const code = char.charCodeAt(0);
+  return char === "_" || (code >= 65 && code <= 90) || (code >= 97 && code <= 122);
+}
+
+function isIdentifierPart(char) {
+  return isIdentifierStart(char) || isDigit(char);
+}
+
+function isDigit(char) {
+  if (!char) return false;
+  const code = char.charCodeAt(0);
+  return code >= 48 && code <= 57;
+}
+
+function isHexDigit(char) {
+  if (!char) return false;
+  const code = char.charCodeAt(0);
+  return isDigit(char) || (code >= 65 && code <= 70) || (code >= 97 && code <= 102);
+}
+
+function isWhitespace(char) {
+  return char === " " || char === "\t" || char === "\n" || char === "\r" || char === "\f" || char === "\v";
+}
+
+function isSymbolStart(char) {
+  return Boolean(char && "(),.=+-*/%<>!|&~".includes(char));
+}
+
+function isTwoCharacterSymbol(value) {
+  return value === "<=" || value === ">=" || value === "!=" || value === "<>" || value === "=="
+    || value === "||" || value === "<<" || value === ">>";
+}
+
+function isKeyword(token, keyword) {
+  return token?.kind === "word" && token.upper === keyword;
+}
+
+function unsupportedStatement() {
+  return new Error("Statement type is not allowed");
+}