Workflow fix

.codex/skills/clava-scripting/SKILL.md

@@ -0,0 +1,39 @@
+---
+name: clava-scripting
+description: Create, update, and explain Clava/LARA scripts in TypeScript using Clava-JS and Lara-JS APIs, including Query/Selector usage, joinpoint selection and filters, and AST transformations. Use for Clava script authoring, joinpoint queries, or refactoring code via Clava/Lara weaver APIs.
+---
+
+# Clava Scripting
+
+## Overview
+
+Write and modify Clava scripts in TypeScript using Clava/Lara APIs for joinpoint selection and AST transformations.
+
+## Quick Start
+
+Use ESM imports with `.js` extensions, select joinpoints with `Query`, and transform with Clava APIs.
+
+```ts
+import Query from "@specs-feup/lara/api/weaver/Query.ts";
+import { FunctionJp } from "@specs-feup/clava/api/Joinpoints.ts";
+
+const $fn = Query.search(FunctionJp, { isImplementation: true }).first();
+if ($fn) $fn.clone(`${$fn.name}_clone`);
+```
+
+## Workflow
+
+1. Identify joinpoints and attributes.
+Use the generated joinpoint wrappers in `@specs-feup/clava/api/Joinpoints.ts` and check `Joinpoints.ts` for default attributes and available fields.
+
+2. Select joinpoints with Query/Selector.
+Use `Query.search`, `Query.searchFrom`, `Query.searchFromInclusive`, `Query.childrenFrom`, and `Selector.scope`. Filters accept strings, regex, predicate functions, or objects keyed by attributes. `Selector` is iterable and methods like `.get()`, `.first()`, and `.chain()` consume the current selection.
+
+3. Transform and emit code.
+Use joinpoint methods like `.clone()`, `.replaceWith()`, `.addParam()`, `.setReturnType()`, and factories in `ClavaJoinPoints` for new nodes. Use `Query.root().code` or `Clava.writeCode()` to inspect or emit output.
+
+## References
+
+- `references/query-api.md` for Query/Selector behavior and filters.
+- `references/clava-apis.md` for key Clava/Lara API entry points and file locations.
+- `references/examples.md` for real scripts and test patterns.

.codex/skills/clava-scripting/agents/openai.yaml

@@ -0,0 +1,4 @@
+interface:
+  display_name: "Clava Scripting"
+  short_description: "Write and edit Clava/Lara scripts"
+  default_prompt: "Use $clava-scripting to draft a Clava TypeScript script that queries joinpoints and applies a transformation."

.codex/skills/clava-scripting/references/clava-apis.md

@@ -0,0 +1,33 @@
+# Clava and Lara API Entry Points
+
+Use this to locate the right TypeScript APIs and understand where functionality lives.
+
+## Clava-JS APIs (this repo)
+
+- Joinpoint wrappers (generated): `Clava-JS/api/Joinpoints.ts`
+- Joinpoint factories/utilities: `Clava-JS/api/clava/ClavaJoinPoints.ts`
+- Core Clava utilities and AST stack: `Clava-JS/api/clava/Clava.ts`
+- Common passes/opts built on Query: `Clava-JS/api/clava/opt`, `Clava-JS/api/clava/pass`
+
+Imports typically use:
+- `@specs-feup/clava/api/Joinpoints.ts`
+- `@specs-feup/clava/api/clava/ClavaJoinPoints.ts`
+- `@specs-feup/clava/api/clava/Clava.ts`
+
+## Lara-JS APIs (sibling repo)
+
+- Query API: `../lara/Lara-JS/api/weaver/Query.ts`
+- Selector behavior and filters: `../lara/Lara-JS/api/weaver/Selector.ts`
+- Weaver utilities: `../lara/Lara-JS/api/weaver/Weaver.ts`
+
+If the Lara-JS repo is not a sibling of Clava, search for `Lara-JS/api/weaver/Query.ts`.
+
+Imports typically use:
+- `@specs-feup/lara/api/weaver/Query.ts`
+- `@specs-feup/lara/api/weaver/Weaver.ts`
+
+## Notes
+
+- Joinpoint wrappers expose attributes and methods specific to each type.
+- `ClavaJoinPoints` provides factory helpers for types, statements, expressions, and declarations.
+- Use `.code` on joinpoints (or `Query.root().code`) to inspect generated code quickly.

.codex/skills/clava-scripting/references/examples.md

@@ -0,0 +1,28 @@
+# Script Examples and Patterns
+
+Use these files for concrete patterns and idioms.
+
+## Weaver tests (JS, but patterns apply to TS)
+
+- `ClavaWeaver/resources/clava/test/weaver/Function2.js`
+  - Select function, clone it, change return type, replace body, add param.
+
+- `ClavaWeaver/resources/clava/test/weaver/Clone.js`
+  - Clone all functions with definitions and print file code.
+
+- `ClavaWeaver/resources/clava/test/weaver/Field.js`
+  - Navigate record fields and read attributes like `isPublic`.
+
+- `ClavaWeaver/resources/clava/test/issues/Issue168.js`
+  - Normalize loops and decompose statements using `NormalizeToSubset` and `StatementDecomposer`.
+
+- `ClavaWeaver/resources/clava/test/issues/Issue_aiq_1.js`
+  - Filter loops by kind, inspect condition relation.
+
+## API tests
+
+- `ClavaWeaver/resources/clava/test/api/ClavaJoinPointsTest.js`
+  - Large catalog of `ClavaJoinPoints` factory helpers.
+
+- `Clava-JS/api/Query.test.ts`
+  - Query chaining, `.scope()`, `.chain()`, and regex selection.

.codex/skills/clava-scripting/references/query-api.md

@@ -0,0 +1,47 @@
+# Query and Selector API
+
+Use this when writing or debugging joinpoint selection logic.
+
+## Primary sources
+
+- Query API: `../lara/Lara-JS/api/weaver/Query.ts` (sibling worktree)
+- Selector behavior: `../lara/Lara-JS/api/weaver/Selector.ts` (sibling worktree)
+- Query usage tests: `Clava-JS/api/Query.test.ts`
+
+If the Lara-JS repo is not a sibling of Clava, search for `Lara-JS/api/weaver/Query.ts`.
+
+## Core patterns
+
+- `Query.root()` returns the root joinpoint.
+- `Query.search(Type, filter?, traversal?)` starts from root.
+- `Query.searchFrom($base, Type?, filter?, traversal?)` searches below a base node (exclusive).
+- `Query.searchFromInclusive($base, Type?, filter?, traversal?)` includes the base node.
+- `Query.childrenFrom($base, Type?, filter?)` searches direct children.
+- `Selector.scope(Type?, filter?)` searches inside the scope of the previously selected nodes.
+
+## Filters
+
+Filters accept:
+- A string or regex applied to the default attribute for that joinpoint type.
+- A predicate function `(jp) => boolean`.
+- An object with attribute names as keys and values of string/regex/predicate.
+
+Default attributes are defined in the joinpoint wrappers and can be resolved via `Weaver.getDefaultAttribute()`.
+
+## Selector consumption
+
+`Selector` is iterable and is consumed by `for..of`, `.get()`, `.first()`, and `.chain()`.
+Use `.chain()` when you need the full chain map (e.g., `loop`, `loop_0`, `loop_1`).
+
+## Minimal examples
+
+```ts
+for (const $fn of Query.search(FunctionJp, { isImplementation: true })) {
+  // $fn is a joinpoint instance
+}
+
+const chains = Query.search(FunctionJp, "query_loop")
+  .search(Loop)
+  .search(Loop)
+  .chain();
+```

.github/workflows/copilot-setup-steps.yml

@@ -7,6 +7,7 @@
 on:
   workflow_dispatch:
   push:
+    branches: [master, staging]
     paths:
       - .github/workflows/copilot-setup-steps.yml
   pull_request:
@@ -46,77 +47,40 @@
         uses: actions/checkout@v6
         with:
           path: clava
+          fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Determine repository refs
-        id: repo-refs
-        shell: bash
-        env:
-          BRANCH_NAME: ${{ env.BRANCH_NAME }}
-          BASE_BRANCH: ${{ github.base_ref }}
-        run: |
-          set -euo pipefail
-
-          # For each dependency repository, determine which branch to checkout.
-          # Priority order:
-          # 1. A branch with the same name as the current branch
-          # 2. If this is a PR, the target branch (base_ref)
-          # 3. The default branch of the repository
-
-          determine_ref() {
-            local prefix=$1
-            local repo=$2
-            local url="https://github.com/${repo}.git"
-
-            # Get the default branch
-            local default_branch
-            default_branch=$(git ls-remote --symref "$url" HEAD | awk '/^ref:/ {print $2}' | sed 's@refs/heads/@@')
-            echo "${prefix}_default=${default_branch}" >> "$GITHUB_OUTPUT"
-            echo "Default branch for ${repo} is '${default_branch}'"
-
-            local ref_to_use=""
-
-            # Priority 1: Same branch name
-            if [ -n "$(git ls-remote --heads "$url" "refs/heads/${BRANCH_NAME}")" ]; then
-              ref_to_use="${BRANCH_NAME}"
-              echo "Using matching branch '${BRANCH_NAME}' in ${repo}"
-            # Priority 2: PR target branch (if this is a PR)
-            elif [ -n "${BASE_BRANCH}" ] && [ -n "$(git ls-remote --heads "$url" "refs/heads/${BASE_BRANCH}")" ]; then
-              ref_to_use="${BASE_BRANCH}"
-              echo "Using PR target branch '${BASE_BRANCH}' in ${repo}"
-            # Priority 3: Default branch
-            else
-              ref_to_use="${default_branch}"
-              echo "Using default branch '${default_branch}' for ${repo}"
-            fi
-
-            echo "${prefix}_ref=${ref_to_use}" >> "$GITHUB_OUTPUT"
-          }
-
-          determine_ref "lara" "specs-feup/lara-framework"
-          determine_ref "specs" "specs-feup/specs-java-libs"
+        uses: specs-feup/branch-resolver@v1
+        with:
+          source-directory: clava
+          dependencies: |
+            lara specs-feup/lara-framework
+            specs specs-feup/specs-java-libs
 
       - name: Echo checks
         run: |
           echo "Weaver branch: ${{ env.BRANCH_NAME }}"
-          echo "PR target branch (if any): ${{ github.base_ref }}"
-          echo "Lara framework ref: ${{ steps.repo-refs.outputs.lara_ref }}"
-          echo "Lara framework default: ${{ steps.repo-refs.outputs.lara_default }}"
-          echo "Specs-java-libs ref: ${{ steps.repo-refs.outputs.specs_ref }}"
-          echo "Specs-java-libs default: ${{ steps.repo-refs.outputs.specs_default }}"
+          echo "Lara framework branch: ${{ env.lara_branch }}"
+          echo "Lara framework commit: ${{ env.lara_ref }}"
+          echo "Lara framework default: ${{ env.lara_default }}"
+          echo "Specs-java-libs branch: ${{ env.specs_branch }}"
+          echo "Specs-java-libs commit: ${{ env.specs_ref }}"
+          echo "Specs-java-libs default: ${{ env.specs_default }}"
 
       - name: Checkout lara-framework
         uses: actions/checkout@v6
         with:
           repository: specs-feup/lara-framework
           path: lara-framework
-          ref: ${{ steps.repo-refs.outputs.lara_ref }}
+          ref: ${{ env.lara_ref }}
 
       - name: Checkout specs-java-libs
         uses: actions/checkout@v6
         with:
           repository: specs-feup/specs-java-libs
           path: specs-java-libs
-          ref: ${{ steps.repo-refs.outputs.specs_ref }}
+          ref: ${{ env.specs_ref }}
 
       - name: Build Weaver
         run: |