veefore 1.6.0 → 1.6.1

package/dist/veefore.mjs

@@ -4376,13 +4376,13 @@ function findGuardedKeys(sources) {
 }
 function dynamicCheckpointKeys(text, file) {
   const found = [];
-  const calls = /(?:\b)[A-Za-z_$]*[cC]heckpoint\(\s*([A-Za-z_$][\w$]*(?:\s*(?:\?\.|\.)\s*[A-Za-z_$][\w$]*)+)\s*[,)]/g;
+  const calls = /(?<![\w$.])[A-Za-z_$]*[cC]heckpoint\(\s*([A-Za-z_$][\w$]*(?:\s*(?:\?\.|\.)\s*[A-Za-z_$][\w$]*)*)\s*[,)]/g;
   for (const call of text.matchAll(calls)) {
     const expression = (call[1] ?? "").replace(/\s+/g, "");
     if (expression === "") continue;
     const head = text.slice(Math.max(0, (call.index ?? 0) - 600), call.index ?? 0);
     const [object, ...rest] = expression.split(".");
-    if (object === void 0 || rest.length === 0) continue;
+    if (object === void 0) continue;
     const access = rest.map((part) => `\\s*(?:\\?\\.|\\.)\\s*${escapeRegex(part)}`).join("");
     const pattern = new RegExp(
       `(?<![\\w$.])${escapeRegex(object)}${access}\\s*={2,3}\\s*['"\`]([a-z][a-z0-9_]*)['"\`]`,
@@ -6866,7 +6866,7 @@ function planCheckpoints(files, read, toolKeys) {
     const placed = [];
     for (const [at, { keys, site }] of sites) {
       if (/^\s*(?:await\s+)?[A-Za-z_$]*[cC]heckpoint\(/.test(source.slice(at, at + 200))) continue;
-      const many = keys.length > 1;
+      const many = keys.length > 1 || site.shared === true;
       const keyExpression = many && site.keyExpression ? site.keyExpression : quote(keys[0] ?? "");
       if (many && !site.keyExpression) continue;
       const args = site.argsExpression ? `, ${site.argsExpression}` : "";
@@ -6892,6 +6892,58 @@ ${blockIndent(source, at)}await ${alias}(${keyExpression}${args});`
   }
   return plans;
 }
+function planCheckpointRepairs(files, read, toolKeys) {
+  const plans = [];
+  const known = new Set(toolKeys);
+  for (const file of files) {
+    if (file.endsWith(".py") || !JS_EXTENSIONS.test(file)) continue;
+    const source = read(file);
+    if (source === null || !/[cC]heckpoint\(/.test(source)) continue;
+    const structure = readStructure(source);
+    const lineOf = lineLocator2(source);
+    const edits = [];
+    const placed = [];
+    const calls = /(?<![\w$.])([A-Za-z_$]*[cC]heckpoint)\(\s*(['"`])([a-z][a-z0-9_]*)\2/g;
+    for (const match of source.matchAll(calls)) {
+      const key = match[3];
+      if (!known.has(key)) continue;
+      const at = match.index ?? 0;
+      const group = enclosing(structure.parens, at).find(
+        (candidate) => BRANCH_KEYWORDS.has(candidate.name)
+      );
+      const head = group ?? innermostBranchAbove(source, structure, at);
+      if (!head) continue;
+      const compared = comparedKeyExpression(source, head, key);
+      if (!compared) continue;
+      const served = branchKeys(source, head, compared);
+      if (served.length < 2 || !served.includes(key)) continue;
+      const keyStart = at + match[0].indexOf(match[2], match[1].length);
+      edits.push({ start: keyStart, end: keyStart + (key.length + 2), text: compared });
+      for (const served_key of served) {
+        placed.push({ key: served_key, line: lineOf(at), shape: "branch", dynamic: true });
+      }
+    }
+    if (edits.length === 0) continue;
+    plans.push({ file, before: source, after: applyEdits(source, edits), placed });
+  }
+  return plans;
+}
+function innermostBranchAbove(source, structure, at) {
+  const body = innermost(
+    structure.blocks.filter((block) => !block.fn),
+    at
+  );
+  if (!body) return null;
+  return structure.parens.filter((group) => BRANCH_KEYWORDS.has(group.name) && group.close < body.open).sort((a, b) => b.close - a.close)[0] ?? null;
+}
+function comparedKeyExpression(source, head, key) {
+  const text = source.slice(head.open, head.close);
+  const pattern = new RegExp(
+    `(?<![\\w$.])([A-Za-z_$][\\w$]*(?:\\s*(?:\\?\\.|\\.)\\s*[A-Za-z_$][\\w$]*)*)\\s*={2,3}\\s*['"\`]${escapeForRegex(key)}['"\`]`
+  );
+  const found = pattern.exec(text);
+  return found ? found[1].replace(/\s+/g, "") : null;
+}
 function checkpointSite(source, key, structure) {
   const quoted = `['"\`]${escapeForRegex(key)}['"\`]`;
   const usable = (at) => awaitAllowed(structure, at) === true;
@@ -6924,11 +6976,13 @@ function checkpointSite(source, key, structure) {
     const compared = comparedExpression(source, at);
     const loop = group.name === "for" ? loopVariable(source, group.open) : null;
     const subject = loop ?? compared?.object ?? null;
+    const served = compared ? branchKeys(source, group, compared.expression) : [];
     return {
       at: insertAt,
       shape: group.name === "if" ? "branch" : "loop",
       argsExpression: subject ? argumentsOf(source, subject) : enclosingArguments(source, structure, insertAt),
-      keyExpression: loop ? `${loop}.name` : compared?.expression ?? null
+      keyExpression: loop ? `${loop}.name` : compared?.expression ?? null,
+      shared: served.length > 1
     };
   }
   const declaration = new RegExp(
@@ -6995,9 +7049,22 @@ function positiveComparison(source, at) {
 }
 function comparedExpression(source, at) {
   const before = source.slice(Math.max(0, at - 160), at);
-  const match = /([A-Za-z_$][\w$]*)\s*(?:\?\.|\.)\s*([A-Za-z_$][\w$]*)\s*={2,3}\s*$/.exec(before);
-  if (!match) return null;
-  return { object: match[1], expression: `${match[1]}.${match[2]}` };
+  const member = /([A-Za-z_$][\w$]*)\s*(?:\?\.|\.)\s*([A-Za-z_$][\w$]*)\s*={2,3}\s*$/.exec(before);
+  if (member) return { object: member[1], expression: `${member[1]}.${member[2]}` };
+  const bare = /(?<![\w$.])([A-Za-z_$][\w$]*)\s*={2,3}\s*$/.exec(before);
+  if (bare) return { object: null, expression: bare[1] };
+  return null;
+}
+function branchKeys(source, group, expression) {
+  const head = source.slice(group.open, group.close);
+  const [object, ...rest] = expression.split(".");
+  if (object === void 0) return [];
+  const access = rest.map((part) => `\\s*(?:\\?\\.|\\.)\\s*${escapeForRegex(part)}`).join("");
+  const pattern = new RegExp(
+    `(?<![\\w$.])${escapeForRegex(object)}${access}\\s*={2,3}\\s*['"\`]([a-z][a-z0-9_]*)['"\`]`,
+    "g"
+  );
+  return [...new Set([...head.matchAll(pattern)].map((match) => match[1]))];
 }
 function switchKey(source, at) {
   const before = source.slice(Math.max(0, at - 4e3), at);
@@ -7511,6 +7578,15 @@ async function integrate(root, toolKeys, options) {
       dispatch = [];
     }
   }
+  const repaired = applyCheckpoints(
+    plan,
+    planCheckpointRepairs(sourceFiles, (file) => currentText(root, plan, file), toolKeys)
+  );
+  if (repaired.size > 0 && !options.quiet) {
+    out(
+      `${symbol.warn} Corrected a guard that named one tool in a block that runs several: ${style.bold([...repaired].join(", "))} ${style.grey("(it now carries the key your code read)")}`
+    );
+  }
   if (dispatch.length > 0 && checkpointUsable(root, options.quiet === true)) {
     const placed = applyCheckpoints(
       plan,
@@ -8821,7 +8897,7 @@ import { homedir as homedir2 } from "node:os";
 import path12 from "node:path";
 
 // src/version.ts
-var CLI_VERSION = "1.6.0";
+var CLI_VERSION = "1.6.1";
 
 // src/panel.ts
 function welcomeSource(flags = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veefore",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Veefore command line: sign in, scan an agent project, set it up and protect its tools.",
   "license": "Apache-2.0",
   "homepage": "https://veefore.com",