agent-canvas 0.1.37 → 0.1.39

package/.github/workflows/deploy-worker-prod.yml

@@ -14,7 +14,6 @@ jobs:
     uses: ./.github/workflows/deploy-worker.yml
     with:
       env: prod
-    secrets:
-      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      SHARE_AUTH_TOKEN: ${{ secrets.SHARE_AUTH_TOKEN_PROD }}
+    # inherit so the reusable workflow can resolve secrets; the env-scoped
+    # values (set on the `prod` environment) win over repo-level ones.
+    secrets: inherit

package/.github/workflows/deploy-worker-stage.yml

@@ -16,7 +16,6 @@ jobs:
     uses: ./.github/workflows/deploy-worker.yml
     with:
       env: stage
-    secrets:
-      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      SHARE_AUTH_TOKEN: ${{ secrets.SHARE_AUTH_TOKEN_STAGE }}
+    # inherit so the reusable workflow can resolve secrets; the env-scoped
+    # values (set on the `stage` environment) win over repo-level ones.
+    secrets: inherit

package/.github/workflows/deploy-worker.yml

@@ -7,14 +7,13 @@ on:
         description: "Target environment (stage or prod)"
         required: true
         type: string
-    secrets:
-      CLOUDFLARE_API_TOKEN:
-        required: true
-      CLOUDFLARE_ACCOUNT_ID:
-        required: true
-      SHARE_AUTH_TOKEN:
-        description: "Bearer token the daemon must send to POST /shares. Optional but strongly recommended in production."
-        required: false
+    # No `secrets:` inputs on purpose. The deploy job below declares
+    # `environment: ${{ inputs.env }}`, so referencing `secrets.X` directly
+    # resolves the matching *environment* secret (falling back to a
+    # repo-level secret of the same name). Callers pass `secrets: inherit`
+    # so org/repo secrets remain reachable too. This is what makes the
+    # CLOUDFLARE_* / SHARE_AUTH_TOKEN values environment-scoped — a prod
+    # token can never be read by a stage deploy and vice versa.
 
 jobs:
   deploy:

package/bin/lib/commands/push.ts

@@ -59,7 +59,11 @@ export async function handlePush(args: string[]) {
   // Skip restart only for clear user errors (syntax errors with line/col,
   // runtime validation errors) — those won't be fixed by a restart.
   const isUserError = !result.ok && result.errors && Object.values(result.errors).every((e: any) =>
-    typeof e === "string" && (/\(line \d+, col \d+\)/.test(e) || e.startsWith("Runtime error:")));
+    typeof e === "string" && (
+      /\(line \d+, col \d+\)/.test(e) ||
+      /Syntax Error|Parse error|Mermaid syntax error/i.test(e) ||
+      e.startsWith("Runtime error:")
+    ));
   const shouldRestart = !result.ok && result.error === "Canvas compilation failed" && !isUserError;
   if (shouldRestart) {
     console.error("Compilation failed, restarting daemon and retrying...");

package/daemon/client/highlightRange.ts

@@ -58,6 +58,7 @@ function getTextNodesInRange(range: Range): Text[] {
     // Skip line numbers and existing marks
     const parent = node.parentElement;
     if (parent?.classList.contains("select-none")) continue;
+    if (parent?.closest("[data-annotation-id]")) continue;
 
     if (range.intersectsNode(node)) {
       nodes.push(node);
@@ -108,27 +109,18 @@ export function restoreMarks(
   container: HTMLElement,
   annotations: { id: string; snippet: string; filePath?: string; context?: { before: string; after: string; hierarchy: string[] } }[]
 ) {
-  // Skip annotations that already have marks in the DOM
-  const toRestore = annotations.filter(
-    (a) => !document.querySelector(`[data-annotation-id="${a.id}"]`)
-  );
-  if (!toRestore.length) return;
+  for (const ann of annotations) {
+    // A canvas can be rendered more than once (overview, compare, hidden
+    // source panes), so restore decisions must be scoped to this container.
+    if (container.querySelector(`[data-annotation-id="${ann.id}"]`)) continue;
 
-  // Build full text content + mapping from text offset to (textNode, offsetInNode)
-  const textNodes: { node: Text; start: number }[] = [];
-  let fullText = "";
-  const walker = document.createTreeWalker(container, NodeFilter.SHOW_TEXT);
-  let tn: Text | null;
-  while ((tn = walker.nextNode() as Text | null)) {
-    if (tn.parentElement?.classList.contains("select-none")) continue;
-    textNodes.push({ node: tn, start: fullText.length });
-    fullText += tn.textContent || "";
-  }
-
-  for (const ann of toRestore) {
     const snippet = ann.snippet;
     if (!snippet) continue;
 
+    // Rebuild after every inserted mark. Wrapping text splits and moves text
+    // nodes, so a cached offset map can point at stale DOM after the first hit.
+    const { fullText, textNodes } = buildTextIndex(container);
+
     // Find all occurrences of the snippet in the full text
     const occurrences: number[] = [];
     let searchFrom = 0;
@@ -181,6 +173,24 @@ export function restoreMarks(
   }
 }
 
+function buildTextIndex(container: HTMLElement): {
+  fullText: string;
+  textNodes: { node: Text; start: number }[];
+} {
+  const textNodes: { node: Text; start: number }[] = [];
+  let fullText = "";
+  const walker = document.createTreeWalker(container, NodeFilter.SHOW_TEXT);
+  let tn: Text | null;
+  while ((tn = walker.nextNode() as Text | null)) {
+    const parent = tn.parentElement;
+    if (parent?.classList.contains("select-none")) continue;
+    if (parent?.closest("[data-annotation-id]")) continue;
+    textNodes.push({ node: tn, start: fullText.length });
+    fullText += tn.textContent || "";
+  }
+  return { fullText, textNodes };
+}
+
 function offsetToNode(
   textNodes: { node: Text; start: number }[],
   offset: number