🐛 Add bounds checking to remove-interaction to prevent crashes

The remove-interaction function used subvec without validating that the index was within bounds, causing 'Index out of bounds' errors when removing multiple interactions in rapid succession. Add bounds validation to return the unchanged interactions vector when an invalid index is provided. This prevents crashes while maintaining data integrity and idempotent behavior. Closes #11546 AI-assisted-by: qwen3.7-plus
2026-09-08 19:59:54 -04:00 · 2026-09-08 08:33:42 +00:00
52 changed files with 336 additions and 1249 deletions
@@ -1,90 +0,0 @@
-# Agent skills
-
-This folder is the single home for the skills our coding agents use.
-Each skill is a folder with a `SKILL.md` inside — a short instruction
-manual that an agent loads only when it needs it.
-
-One copy serves every tool:
-
- **opencode** reads this folder directly.
- **Claude Code** reads it through the `.claude/skills` symlink.
- **Codex** reads it directly.
-
-To change how the agents behave, edit the `SKILL.md` here. There is no
-second copy to keep in sync.
-
-## How the skills are organized
-
-**Flows** are the six skills you invoke by name. Each one covers one step
-in the life of a change: plan it, review the plan, implement it, review
-the code, open the pull request.
-
-**References** hold the quality standards. A flow's reviewer loads them;
-you rarely touch them directly.
-
-**Procedures** define how one concrete step is done — a plan document, an
-issue, a commit. Flows call them, but they also work on their own.
-
-**Utilities** are small helpers for everyday work: search, file lookup,
-JSON, REPL access, and so on.
-
-## Flows
-
-| Skill | What it does | When you would say |
-|---|---|---|
-| [`make-a-plan`](skills/make-a-plan/SKILL.md) | Researches the task, writes an implementation plan, asks you the open questions in plain language, and saves the plan to `.agents/plans/`. | "make a plan for the token refresh bug" |
-| [`review-plan`](skills/review-plan/SKILL.md) | Evaluates a plan before anyone writes code: completeness, ordering, risks. Approves it or asks for changes. | "review this plan before we start" |
-| [`implement-plan`](skills/implement-plan/SKILL.md) | Shows you the full flow first — the issue and branch it will create (or the branch it continues on), the execution style, and the task checklist — and, after your go-ahead, executes a ready plan. Default: every task, one commit. On request ("step by step"): one task, one commit, your confirmation between tasks. | "implement the plan" · "step by step, one commit per task" |
-| [`review-code`](skills/review-code/SKILL.md) | Reviews a diff, branch, or PR and returns findings ranked by impact. | "review my changes before I push" |
-| [`create-pr`](skills/create-pr/SKILL.md) | Opens a pull request for the current branch — with checks on base branch, commits, issue, and push state — or updates an existing PR's title and description. | "open a PR for this branch" |
-| [`resolve-git-conflicts`](skills/resolve-git-conflicts/SKILL.md) | Untangles merge or rebase conflicts: explains both sides, proposes a resolution, applies it after you approve. Never runs `git rebase --continue`. | "resolve these conflicts" |
-
-## References
-
-| Skill | What it holds |
-|---|---|
-| [`plan-review-criteria`](skills/plan-review-criteria/SKILL.md) | The plan review rubric: six axes, severity levels, approval standard, output format. The `review-plan` reviewer loads it. |
-| [`code-review-criteria`](skills/code-review-criteria/SKILL.md) | The code review rubric: five axes, core principles (DRY, KISS, YAGNI), severity format, verdict. The `review-code` reviewer loads it. |
-
-## Procedures
-
-| Skill | What it does |
-|---|---|
-| [`planner`](skills/planner/SKILL.md) | The spec of a good plan: context, architecture decisions, tasks with acceptance criteria, checkpoints. Used by `make-a-plan`. |
-| [`create-issue`](skills/create-issue/SKILL.md) | Creates a GitHub issue that follows Penpot conventions. Used by `implement-plan`; also works on its own. |
-| [`create-commit`](skills/create-commit/SKILL.md) | Makes a commit the Penpot way: emoji subject, clear body, `AI-assisted-by` trailer. Used by `implement-plan`; also works alone when you say "commit this". |
-
-## Utilities
-
-| Skill | What it does |
-|---|---|
-| [`bat-cat`](skills/bat-cat/SKILL.md) | Read files in the terminal with syntax highlighting and line numbers. |
-| [`fd-find`](skills/fd-find/SKILL.md) | Find files by name or pattern, respecting `.gitignore`. |
-| [`ripgrep`](skills/ripgrep/SKILL.md) | Fast content search with regular expressions. |
-| [`jq-json-processor`](skills/jq-json-processor/SKILL.md) | Slice, filter, and reshape JSON output. |
-| [`nrepl-eval`](skills/nrepl-eval/SKILL.md) | Run Clojure or ClojureScript code in the live REPL sessions (backend and frontend). |
-| [`taiga`](skills/taiga/SKILL.md) | Look up Penpot issues, user stories, and tasks in Taiga. |
-| [`testing`](skills/testing/SKILL.md) | The repo's testing rules and TDD workflow, loaded before writing tests. |
-| [`security-and-hardening`](skills/security-and-hardening/SKILL.md) | Security checks for code that handles user input, auth, or external services. |
-| [`ste`](skills/ste/SKILL.md) | Rewrites prose in Simplified Technical English. Loads only when you name it. |
-| [`refine-prompt`](skills/refine-prompt/SKILL.md) | Rewrites a rough prompt into a clearer one. Never runs the prompt. |
-| [`update-changelog`](skills/update-changelog/SKILL.md) | Regenerates `CHANGES.md` from a GitHub milestone. |
-
-## A typical round
-
-1. `/make-a-plan` — you get a plan and a saved file in `.agents/plans/`.
-2. `/review-plan` — a second opinion; approve or request changes.
-3. `/implement-plan` — the code gets written and committed. Starting from a base branch, it also opens the GitHub issue and the `issue-NNNN` branch; the plans that follow continue on that same branch.
-4. `/review-code` — a reviewer checks the commit.
-5. `/create-pr` — the branch goes up as a pull request.
-
-Every step also works on its own, and you can always say what you want
-in plain words — the agents pick the right skill from what you say.
-
-## Adding or changing a skill
-
-Create a folder here with a `SKILL.md` inside. The file needs `name` and
-`description` in its frontmatter, and a clear "When to use" section so
-agents know when to reach for it. Keep one job per skill, and keep the
-two families apart: flows are named with a verb first; reference skills
-end in `-criteria`.
@@ -1,105 +0,0 @@
---
-name: create-pr
-description: PR flow — open a new PR for the current task branch (validates base branch, commits, issue and push state) or update an existing PR's title or description to match Penpot conventions. Use it when the user asks to open or create a PR, in any phrasing.
---
-
-# Create PR
-
-Two modes. **Open mode** takes the current task branch to a new, validated
-PR. **Update mode** rewrites an existing PR's title or description. Gather
-information, validate, and act in one pass. If validation fails, STOP with a
-single coherent message that lists every problem and states exactly what
-information is missing — never fix or work around problems silently.
-
-Both modes require an authenticated `gh` CLI (`gh auth status`) and never
-push — the user pushes from their own shell.
-
-## When to use
-
- The user asks to open or create a NEW PR for the current task branch, in
-  any phrasing ("open a PR", "create the pull request", "put this up for
-  review") — or runs `/create-pr`. → **Open mode**.
- The user asks to fix or update an EXISTING PR's title or description to
-  match conventions. → **Update mode**.
-
-If the running agent cannot write (for example, the plan agent), say so and
-stop — this skill needs the build agent.
-
-## Open mode
-
-### 1. Gather context (read-only)
-
- Current branch: `git rev-parse --abbrev-ref HEAD`.
- Target base branch: run `./scripts/detect-target-branch` from the repo root.
-  It prints the nearest ancestor branch of HEAD (exit 0) or fails (exit 1).
- Commits: `git log --oneline <base>..HEAD`.
- Push state (local): `git rev-parse --verify origin/<branch>` and compare
-  with HEAD. It reads the local remote-tracking ref — no network, no SSH. It
-  reflects the last push or fetch this clone knows about.
- Issue: from the session context, or from the branch name — `issue-NNNN`
-  maps to issue NNNN; recover its title and body with `gh issue view NNNN`.
-
-### 2. Validate — stop with one message if anything fails
-
-Run all checks before reporting, then report every failure together:
-
-1. **Base branch not usable.** If the script fails (exit 1), or its output —
-   after stripping an optional `remotes/origin/` prefix — is not one of the
-   canonical branches (`develop`, `staging`, `main`), stop and ask the user
-   to re-run with more context — for example, passing the base branch
-   explicitly in their invocation. An explicit base given by the user
-   overrides the script's output.
-2. **On a base branch.** There is no task branch to merge — say so and stop.
-3. **No commits.** The branch has no commits ahead of the base — say so and
-   stop.
-4. **No clear issue.** There is no issue in the session context, and the
-   branch name has no `issue-NNNN` pattern (or `gh issue view` finds nothing)
-   — say so and stop. Exception: the user's invocation says `no issue` /
-   `without issue` — then continue without an issue reference.
-5. **Branch not pushed.** The remote-tracking ref `origin/<branch>` is
-   missing, or `git rev-parse origin/<branch>` differs from HEAD — the
-   branch was never pushed, or has commits the remote does not have. Never
-   push yourself; ask the user to push and to run `/create-pr` again
-   afterwards, then stop.
-
-### 3. Already-open PR
-
-Check whether a PR already exists for this branch (`gh pr list --head
-<branch>`). If one exists, report its URL and stop — do not create a second
-one. Title or description fixes belong to Update mode.
-
-### 4. Write and create the PR
-
-Write the title and body following `mem:workflow/creating-prs` (title format,
-description structure, writing principles) and `mem:workflow/creating-commits`
-(commit type emojis). Derive the title and body from the commits and, when
-there is one, from the issue body. Reference the issue with `Closes #NNNN`.
-
-```bash
-gh pr create --repo penpot/penpot --title "<TITLE>" --body-file /tmp/pr-body.md
-```
-
-### 5. Report
-
-Report the PR URL and stop.
-
-## Update mode
-
-1. Identify the PR: the number given by the user, or `gh pr list --head
-   <branch>`.
-2. Write the new title and/or body following `mem:workflow/creating-prs`.
-3. Apply and verify:
-
-```bash
-gh pr edit <NUMBER> --repo penpot/penpot --title "<TITLE>" --body-file /tmp/pr-body.md
-gh pr view <NUMBER> --repo penpot/penpot --json title,body
-```
-
-4. Report and stop.
-
-## User context
-
-Extra context in the user's invocation (the message that triggered this skill)
-plays the role command arguments play elsewhere: overrides such as `no issue` /
-`without issue`, an explicit base branch (`from origin/staging`), a PR number
-for Update mode, and so on.
@@ -1,132 +0,0 @@
---
-name: implement-plan
-description: Implementation flow — execute a ready plan from the session context: read the plan, detect the flow, then present the full picture (issue and branch to create or the branch to continue on, execution style, task checklist) and wait for confirmation. Default is every task with one final commit; on request ("step by step"), one task and one commit at a time with a pause after each. Use it when the user asks to implement or execute a plan, in any phrasing.
---
-
-# Implement Plan
-
-This flow is run once a plan is ready (for example, from plan mode). Execute
-the plan already prepared in the current session context. It never pushes —
-the user pushes.
-
-By default it ends with exactly one commit. When the user asks for it
-("step by step"), it commits once per task instead and waits for the
-user's confirmation after each one (see *Execution modes*).
-
-## When to use
-
- The user asks to implement or execute a plan, in any phrasing:
-  "implement the plan", "execute it", "go build it" — or runs
-  `/implement-plan`.
- A ready, reviewed plan is in the session context or a plan file path
-  was given (typically after `/make-a-plan` or `/review-plan`).
-
-Do not use it to produce plans — that is the `make-a-plan` flow.
-
-## 1. Read the plan first
-
-Identify the plan to execute — from the file path the user gave, the
-arguments, or the session context. Read it completely. Read the required
-memories before writing any code: `mem:critical-info` and the core memory
-of every module the plan touches, plus the deeper memories they reference
-(AGENTS.md governs this).
-
-## 2. Detect the flow (no questions)
-
-Inspect the current branch with `git rev-parse --abbrev-ref HEAD`, pick the
-mode, and announce it in one line before presenting anything. Detection is
-read-only: nothing is created until the user confirms (step 3).
-
- **On a base branch** (`main`, `develop`, `staging`) → **standalone mode**:
-  a new GitHub issue and a branch `issue-NNNN` will be created after the
-  user's confirmation.
- **On any other branch** (a feature branch, typically `issue-NNNN`) →
-  **continue mode**: the implementation continues on the current branch.
-  No issue or branch is created. The branch name provides the issue
-  reference when it follows the `issue-NNNN` pattern.
-
-Arguments override detection: `standalone`, `continue`,
-`no issue` / `without issue`, or an explicit base such as
-`from origin/develop`.
-
-**Standalone while already on a feature branch:** stop and explain that this
-would stack branches. Ask the user to re-run with an explicit base, for
-example `from origin/develop` — then branch from that base instead of HEAD.
-
-## 3. Present the checklist and wait
-
-Before touching the repository, show the user the full picture:
-
- **The flow**: whether the GitHub issue and the branch will be created
-  (standalone mode — give the planned branch name, `issue-NNNN` or
-  `plan-<slug>`), or whether you continue on the current branch
-  (continue mode — name it).
- **The execution style**: batch or step-by-step (see *Execution modes*).
- A checklist (todolist) of the plan's tasks, in order.
-
-Then WAIT for the user's explicit confirmation. Do not start until you
-have it. If the plan has no discrete tasks, ask the user how to split
-it, or propose running it as a single change.
-
-## 4. Execute the plan
-
-**Standalone setup, after the confirmation:** create the issue with the
-**`create-issue`** skill, following the *Creating Issues from Draft Body*
-flow in `mem:workflow/creating-issues`. Derive the issue title and body
-from the plan, capture the new issue's number — call it **NNNN** — and
-create the branch from the current HEAD:
-
-```
-git checkout -b issue-NNNN
-```
-
-If the arguments say `no issue` / `without issue`, skip the issue and
-create a branch named `plan-<slug>` instead, where `<slug>` is the plan
-title, lowercase and hyphen-separated.
-
-### Batch mode (default)
-
-Implement every task in one go. Work methodically, keeping changes
-focused on what the issue requires. Respect the plan's proposed
-parallelization when it applies.
-
-When the implementation is complete, load the **`create-commit`** skill
-and follow its workflow to commit the changes. Provide a brief summary
-of what was implemented and why, the issue reference (`issue-NNNN`) when
-there is one, and the model name you are running as so the
-`AI-assisted-by` trailer is set correctly.
-
-### Step-by-step mode (on request)
-
-When the user asks for it — "step by step", "task by task", "one commit
-per task" — loop one task at a time:
-
- Execute exactly ONE task.
- Commit it now: load the **`create-commit`** skill and follow it —
-  one commit per task, never two tasks in one commit. Same inputs as
-  always: what and why, the issue reference, your model name.
- Show the user the result (what changed, files touched, how it was
-  verified).
- WAIT for the user's confirmation before starting the next task.
-
-Never batch in this mode: no two tasks in one commit, and no new task
-before the user confirms. If a task turns out much bigger than planned,
-stop and ask the user before splitting it.
-
-## When you are done
-
-End by suggesting the next steps (suggestions, not a required pipeline — any
-instruction from me overrides them):
-
- `/review-code` — to review the changes just committed; it routes to
-  `/make-a-plan` by itself if the findings need one.
- `/create-pr` — when the task is done and the branch is ready to merge.
-
-## User context
-
-Extra context in the user's invocation (the message that triggered this
-skill) plays the role command arguments play elsewhere: `standalone`,
-`continue`, `no issue` / `without issue`, an explicit base such as
-`from origin/develop`, or `step by step` / `one commit per task` for the
-step-by-step execution mode. Modes combine freely, for example
-"standalone step by step".
@@ -1,100 +0,0 @@
---
-name: make-a-plan
-description: Planning flow — research the subject of this session, produce an implementation plan with the planner skill, resolve open questions with the user in plain language, and save the final plan to .agents/plans/. Use it when the user asks to plan, design, or break down a task, in any phrasing.
---
-
-# Make a Plan
-
-Act as a senior software engineer: research the subject of this session in depth and
-produce a well-grounded, actionable implementation plan.
-
-If the running agent cannot write (for example, the plan agent), say so and
-stop — this skill needs the build agent to save the plan.
-
-## When to use
-
- The user asks to plan, design, or break down a task, in any phrasing:
-  "make a plan", "how would we build X", "design an approach for Y" —
-  or runs `/make-a-plan`.
- The user asks to rework or extend an existing plan (for example, after
-  review findings) — revise the saved plan file in place.
-
-Do not use it to execute a plan — that is the `implement-plan` flow.
-
-## Instructions
-
-1. **Produce the plan** with the `planner` skill. By default, research the
-   subject of this session and draft the plan yourself. If I ask for it (for
-   example, `delegated` in the user context), delegate to the `general` subagent
-   instead — the delegate must also follow the `planner` skill and receive all
-   the relevant session context (a review, user feedback, and so on).
-2. Before asking me to decide anything, explain the plan and every open question in
-   plain language. Assume I know only the high-level project goal, not the codebase,
-   architecture, implementation terms, or the problem this task solves.
-3. Once all decisions are answered and the plan is final, save it verbatim to the
-   announced path under `.agents/plans/` (create the directory if it does not
-   exist). This step is the flow's explicit authorization to write the plan
-   file — the only write allowed here. If I later ask for changes, update the
-   saved file directly.
-4. Present me with a clear, self-contained summary of the plan's most relevant points
-   only after all required decisions have been answered. Write it for someone who knows
-   only the project's high-level goal and may not know the plan's low-level context.
-   Explain necessary technical language in plain terms, include the problem being
-   solved and the proposed outcome, and do not assume that listing technical task names
-   is enough.
-
-### Hard rule — read-only while planning
-
-While this flow runs, act read-only: research with read-only tools only.
-Never edit source files, never run builds, tests, linters, or any command that
-modifies state, and never commit. The single allowed write is the plan file in
-step 3. This rule expires when I approve the plan or move on to another task;
-then you act as a normal build agent again.
-
-When the plan contains open questions, do not show them as bare technical questions or
-assume that I understand the technical language or technical words used in the plan.
-For each question, first explain:
-
- What part of the user problem the decision affects.
- The relevant concept from the beginning, with a small concrete example.
- What each available option would make the system do.
- The practical benefits, costs, risks, and user-visible consequences of each option.
- Which option the planner recommends and why.
-
-Only after that explanation, use the `question` tool to ask the decision with clear,
-non-technical option labels. Put the recommended option first and mark it as
-`(Recommended)`. Group related questions when their context is shared, but do not ask a
-question whose meaning has not already been explained.
-
-If I say that I do not understand a question or its choices, do not treat my previous
-answer as valid. Explain the concepts again from the high-level project goal, use a more
-concrete example, explain the implications, and ask the question again with the
-`question` tool. Repeat this until I can make an informed choice. If one answer creates
-new design consequences or additional decisions, explain those consequences before
-asking any new question.
-
-Distinguish clearly between requirements already fixed by the roadmap or existing
-architecture and choices that actually require my input. Do not ask me to choose an
-implementation detail when the plan can resolve it safely without changing the public
-behavior. If there are no decisions that require my input, say so and present the
-summary.
-
-IMPORTANT: **Under no circumstances execute the plan. Wait for the user to review it
-after all possible questions have been answered.** The final summary must explain the
-problem being solved, the proposed behavior, the main user-visible workflow, important
-constraints and risks, what is deliberately out of scope, and the path where the plan
-is saved. Never assume that a short list of task names is enough context. End
-the final response by suggesting the next steps, in this order:
-
-1. `/review-plan` — to get a second opinion on the plan before executing it.
-2. `/implement-plan` — to execute the plan from the current session context.
-
-These are suggestions, not a required pipeline — any instruction from me
-overrides them (for example, asking you to implement the plan directly).
-
-## User context
-
-Extra context in the user's invocation (the message that triggered this skill)
-plays the role command arguments play elsewhere: for example, `delegated` to
-hand the research and drafting to the `general` subagent, or corrections and
-feedback about a previous plan.
@@ -1,47 +0,0 @@
---
-name: resolve-git-conflicts
-description: Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.
---
-
-# Resolve Git Conflicts
-
-Resolve conflicts in the local repository. The user handles finishing the
-rebase themselves — you must **never** run `git rebase --continue`,
-`git rebase --skip`, `git merge --continue`, or anything similar.
-
-## When to use
-
- The repository has unresolved conflicts — during a rebase, merge, or
-  cherry-pick — whether the user asks about them or not.
- The user asks to resolve conflicts, in any phrasing: "fix the merge
-  conflicts", "resolve these", "what's conflicting here?".
-
-## Phase 1 — Understand the problem (read-only)
-
-1. Run `git status` to detect the conflict state (rebase, merge, cherry-pick, etc.) and list conflicted files.
-2. For each conflicted (unmerged) file, understand the situation **without modifying anything**:
-   - Read the file and identify the conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`).
-   - Inspect both sides — `git show <ours>:<file>` and `git show <theirs>:<file>` — plus `git log`/`git show` on the commits involved to understand intent.
-   - Identify what each side changed and why, and how they should be combined.
-
-## Phase 2 — Present the resolution plan
-
-3. **Present a clear plan to the user before touching any file.** For each conflicted file, state:
-   - What each side changed and why.
-   - Your proposed resolution and the reasoning behind it.
-   - How the two sides are combined (both additive → merge; both modify the same code → keep the semantically correct version, merging intent from both sides when clear from code and context).
-4. **Ask the user only when genuinely unclear.** Do not ask about anything you can determine yourself from the code, commit messages, or context. Only decisions that are not determinable and change the outcome (e.g. conflicting product decisions, which side to discard) warrant a question. **Collect all such questions together in an "Open Questions" section at the end of the plan**, so the user has full context to answer them properly.
-5. **Wait for the user to accept the plan** (and answer any open questions) before editing, staging, or otherwise modifying anything.
-
-## Phase 3 — Execute
-
-6. Resolve each conflicted file by editing the file to the agreed merged content and removing all conflict markers.
-
-## Phase 4 — Stage and verify
-
-7. **Stage every resolved file** with `git add <file>`. Do not stage unrelated untracked files unless clearly part of the resolution.
-8. Verify no conflict markers remain (search for `<<<<<<<` / `>>>>>>>` in resolved files) and that `git status` shows no unmerged paths.
-
-## Phase 5 — Report
-
-9. Briefly report the conflict state, how each conflicted file was resolved (and any answers received to open questions), and stop — do **not** run `git rebase --continue` or any other continuation command.
@@ -1,73 +0,0 @@
---
-name: review-code
-description: Code review flow — review a diff, PR, or code change, delegating the review to a subagent that follows the code-review-criteria skill. Use it when the user asks to review code or a PR, in any phrasing.
---
-
-# Review Code
-
-Act as a senior software engineer and perform a thorough code review.
-
-## When to use
-
- The user asks to review code, in any phrasing: "review this diff",
-  "review the PR", "check my changes", "code review" — or runs
-  `/review-code`.
- A commit, branch, PR, or diff is ready and the user wants it assessed
-  before merge.
-
-## Instructions
-
-1. **Determine what is being reviewed** from the user context: a working-tree
-   diff, a commit range, a branch, a PR (number or URL), or specific files. If
-   the target is ambiguous, ask before reviewing.
-2. Delegate the review to the `general` subagent (via the task tool), unless the
-   user specifies another agent. Include in the prompt the
-   **`code-review-criteria`** skill name and all user context.
-3. When the subagent returns, output the review to the user verbatim. Do not
-   summarize it and do not act on its findings.
-4. Right after the review, suggest how to proceed based on the findings. These
-   are suggestions — the user decides:
-   - **Approve (no required changes):** say so — there is nothing to address.
-   - **Minor findings (nits):** applying them directly as-is is fine once the
-     review is done — no plan needed.
-   - **Substantive findings:** suggest `/make-a-plan` to make a plan to address
-     them.
-
-### Hard rule — read-only while reviewing
-
-This flow is read-only **for the duration of the review**: from the moment it
-starts until the user considers the review finished (including any feedback,
-questions, or clarifications about it). During that period, never fix,
-implement, edit files or create commits — not even "obvious" fixes derived from
-the findings. Once the user explicitly states the review is done (or moves on to
-a different task), this rule no longer applies and you act as a normal build
-agent again.
-
-## Instructions for the subagent
-
-1. Load the **`code-review-criteria`** skill and follow its process and output
-   format.
-2. Read `AGENTS.md` (if present) and follow its instructions for finding and
-   reading all related testing documentation from memories before reviewing.
-3. Return in your final message the COMPLETE review, verbatim, exactly as the
-   skill instructs it to be produced. Do not summarize it — include the full
-   structured review.
-
-### Strong rules for the subagent
-
-1. Do not invent problems. Every finding must be real and actionable.
-2. Read-only: do not modify any file and do not create a commit — reviewing
-   never writes.
-3. Be specific and constructive. "This could be better" is not helpful — explain
-   why and how.
-4. Prioritize by impact. One structural issue outweighs ten nits.
-5. Missing tests are an issue, not a suggestion. Report as a severity-tagged
-   finding — never as a recommendation.
-6. Skip generated files, lockfile-only changes, and unrelated modifications
-   unless they introduce security risks.
-
-## User context
-
-Extra context in the user's invocation (the message that triggered this skill)
-plays the role command arguments play elsewhere: for example, a PR number or
-URL, a commit range, specific files, or a different agent to run the review.
@@ -1,71 +0,0 @@
---
-name: review-plan
-description: Plan review flow — evaluate an implementation plan before it is executed, delegating the review to a subagent that follows the plan-review-criteria skill. Use it when the user asks to review a plan, in any phrasing.
---
-
-# Review Plan
-
-Act as a senior software engineer and perform a thorough review of an
-implementation plan.
-
-## When to use
-
- The user asks to review a plan, in any phrasing: "review this plan",
-  "does this plan look right?", "second opinion on the plan" — or runs
-  `/review-plan`.
- A plan was just produced (typically by `/make-a-plan`) and the user
-  wants it evaluated before executing it.
-
-## Instructions
-
-1. **Determine the plan under review** from the session context (for example, a
-   plan just produced by `/make-a-plan`) or from a plan file path given by the
-   user (typically under `.agents/plans/`). If a file path is given, read the
-   file first so the complete plan is in context.
-2. Delegate the review to the `general` subagent (via the task tool), unless the
-   user specifies another agent. Include in the prompt the
-   **`plan-review-criteria`** skill name and all user context.
-3. When the subagent returns, output the review to the user verbatim. Do not
-   summarize it and do not act on its findings.
-4. Right after the review, suggest the next step based on the verdict. These
-   are suggestions — the user decides, and any instruction overrides them:
-   - **Approve** → suggest `/implement-plan` to execute it.
-   - **Request changes** → suggest `/make-a-plan` to make a plan to address the
-     findings.
-
-### Hard rule — read-only while reviewing
-
-This flow is read-only **for the duration of the review**: from the moment it
-starts until the user considers the review finished (including any feedback,
-questions, or clarifications about it). During that period, never fix,
-implement, edit files or create commits — not even "obvious" fixes derived from
-the findings. Once the user explicitly states the review is done (or moves on to
-a different task), this rule no longer applies and you act as a normal build
-agent again.
-
-## Instructions for the subagent
-
-1. Load the **`plan-review-criteria`** skill and follow its process and output
-   format.
-2. Read `AGENTS.md` (if present) and follow its instructions for finding and
-   reading all related documentation and testing memories before reviewing.
-3. Return in your final message the COMPLETE review, verbatim, exactly as the
-   skill instructs it to be produced. Do not summarize it — include the full
-   structured review.
-
-### Strong rules for the subagent
-
-1. Do not invent problems. Every finding must be real and actionable.
-2. Read-only: do not modify any file and do not create a commit — reviewing
-   never writes.
-3. Be specific and constructive. "This could be better" is not helpful — explain
-   why and how.
-4. Prioritize by impact. One structural issue outweighs ten nits.
-5. Judge the plan as the implementer would: every task executable without
-   guessing, ordering follows the dependency graph, risks named.
-
-## User context
-
-Extra context in the user's invocation (the message that triggered this skill)
-plays the role command arguments play elsewhere: for example, a plan file path
-to review, or a different agent to run the review.
@@ -1 +0,0 @@
-../.agents/skills
@@ -101,7 +101,7 @@ opencode.json
 /.playwright-mcp
 /.devenv/mcp/
 /opencode.json
-/.agents/plans
+/.opencode/plans
 /.opencode/reports
 /.opencode/prompts
 /.ci-logs
@@ -1,10 +0,0 @@
---
-description: Create a PR for the current task branch or update an existing one — loads and follows the create-pr skill
-agent: build
---
-
-Load the **`create-pr`** skill and follow it as your only instruction.
-
-## User input, overrides and additional context
-
-$ARGUMENTS
@@ -1,10 +1,39 @@
 ---
-description: Execute a ready plan — task checklist, your confirmation, then all tasks with one commit (default) or step by step with a commit and a pause per task; creates issue + branch when on a base branch — loads and follows the implement-plan skill
+description: Execute a ready plan end-to-end — create a GitHub issue, branch issue-NNNN, implement the plan, then commit via the create-commit skill
 agent: build
 ---

-Load the **`implement-plan`** skill and follow it as your only instruction.
+This command is run once a plan is ready (for example, from plan mode). Execute
+the plan already prepared in the current session context. Follow these steps in order.

-## User input, overrides and additional context
+## 1. Create the issue

-$ARGUMENTS
+Use the **`create-issue`** skill, following the *Creating Issues from Draft Body*
+flow in `mem:workflow/creating-issues`. Derive the issue title and body from the
+plan. Capture the new issue's number — call it **NNNN** (needed for the branch
+name and the commit reference).
+
+## 2. Create the branch
+
+Create and switch to a branch named after the issue:
+
+```
+git checkout -b issue-NNNN
+```
+
+(Replace NNNN with the issue number from step 1.)
+
+## 3. Execute the plan
+
+Implement the prepared plan from the session context. Work methodically, keeping
+changes focused on what the issue requires. Do not commit — the commit happens in
+step 4.
+
+## 4. Commit with the create-commit skill
+
+After the implementation is complete, load the **`create-commit`** skill and
+follow its workflow to commit the changes. Provide a brief summary of what was
+implemented and why, the issue reference (`issue-NNNN`), and the model name you
+are running as so the `AI-assisted-by` trailer is set correctly.
+
+Do not push. Pushing is handled separately by the user.
@@ -1,10 +0,0 @@
---
-description: Investigate the chosen task, produce an implementation plan, and save it — loads and follows the make-a-plan skill
-agent: build
---
-
-Load the **`make-a-plan`** skill and follow it as your only instruction.
-
-## User input, overrides and additional context
-
-$ARGUMENTS
@@ -1,6 +1,40 @@
 ---
-description: Resolve local git conflicts and stage the resolved files; never continues the rebase — loads and follows the resolve-git-conflicts skill
+description: Resolve local git conflicts and stage the resolved files with git add — never continues the rebase
 agent: build
 ---

-Load the **`resolve-git-conflicts`** skill and follow it as your only instruction.
+# Fix Git Conflicts
+
+Resolve conflicts in the local repository. The user handles finishing the
+rebase themselves — you must **never** run `git rebase --continue`,
+`git rebase --skip`, `git merge --continue`, or anything similar.
+
+## Phase 1 — Understand the problem (read-only)
+
+1. Run `git status` to detect the conflict state (rebase, merge, cherry-pick, etc.) and list conflicted files.
+2. For each conflicted (unmerged) file, understand the situation **without modifying anything**:
+   - Read the file and identify the conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`).
+   - Inspect both sides — `git show <ours>:<file>` and `git show <theirs>:<file>` — plus `git log`/`git show` on the commits involved to understand intent.
+   - Identify what each side changed and why, and how they should be combined.
+
+## Phase 2 — Present the resolution plan
+
+3. **Present a clear plan to the user before touching any file.** For each conflicted file, state:
+   - What each side changed and why.
+   - Your proposed resolution and the reasoning behind it.
+   - How the two sides are combined (both additive → merge; both modify the same code → keep the semantically correct version, merging intent from both sides when clear from code and context).
+4. **Ask the user only when genuinely unclear.** Do not ask about anything you can determine yourself from the code, commit messages, or context. Only decisions that are not determinable and change the outcome (e.g. conflicting product decisions, which side to discard) warrant a question. **Collect all such questions together in an "Open Questions" section at the end of the plan**, so the user has full context to answer them properly.
+5. **Wait for the user to accept the plan** (and answer any open questions) before editing, staging, or otherwise modifying anything.
+
+## Phase 3 — Execute
+
+6. Resolve each conflicted file by editing the file to the agreed merged content and removing all conflict markers.
+
+## Phase 4 — Stage and verify
+
+7. **Stage every resolved file** with `git add <file>`. Do not stage unrelated untracked files unless clearly part of the resolution.
+8. Verify no conflict markers remain (search for `<<<<<<<` / `>>>>>>>` in resolved files) and that `git status` shows no unmerged paths.
+
+## Phase 5 — Report
+
+9. Briefly report the conflict state, how each conflicted file was resolved (and any answers received to open questions), and stop — do **not** run `git rebase --continue` or any other continuation command.
@@ -1,10 +0,0 @@
---
-description: Code review — review a diff, PR, or code change — loads and follows the review-code skill
-agent: build
---
-
-Load the **`review-code`** skill and follow it as your only instruction.
-
-## User input, overrides and additional context
-
-$ARGUMENTS
@@ -1,10 +0,0 @@
---
-description: Plan review — evaluate an implementation plan before executing it — loads and follows the review-plan skill
-agent: build
---
-
-Load the **`review-plan`** skill and follow it as your only instruction.
-
-## User input, overrides and additional context
-
-$ARGUMENTS
@@ -9,11 +9,6 @@ metadata: {"clawdbot":{"emoji":"🦇","requires":{"bins":["bat"]},"install":[{"i

 `cat` with syntax highlighting, line numbers, and Git integration.

-## When to use
-
- Reading or displaying a file in the terminal — prefer it over plain
-  `cat`: syntax highlighting, line numbers, git-side indicators.
-
 ## Quick Start

 ### Basic usage
@@ -1,9 +1,9 @@
 ---
-name: code-review-criteria
-description: Code review criteria — the five review axes, core principles, severity format, and verdict for reviewing code changes. Loaded by the reviewer subagent of the review-code flow. Not a user-facing flow — to review code, use the review-code flow.
+name: code-review
+description: Conducts multi-axis code review. Use before merging any change. Use when reviewing code written by yourself, another agent, or a human. Use when you need to assess code quality across multiple dimensions before it enters the main branch.
 ---

-# Code Review Criteria and Quality
+# Code Review and Quality

 ## Overview

@@ -13,10 +13,11 @@ Multi-dimensional code review with quality gates. Every change gets reviewed bef

 ## When to Use

- The reviewer subagent of the `review-code` flow loads this skill to perform
-  the review of a code change.
- To review code, always go through the `review-code` flow — never load this
-  skill directly for that. This is the criteria reference, not the flow.
+- Before merging any PR or change
+- After completing a feature implementation
+- When another agent or model produced code you need to evaluate
+- When refactoring existing code
+- After any bug fix (review both the fix and the regression test)

 ## Core Principles

@@ -0,0 +1,39 @@
+---
+name: create-pr
+description: Create or update a GitHub PR following Penpot conventions.
+---
+
+# Skill: create-pr
+
+Create or update a GitHub PR. Read and follow:
+- `mem:workflow/creating-prs` — title format, description structure, writing principles
+- `mem:workflow/creating-commits` — commit type emojis
+
+## When to Use
+
+- Creating a new PR from a feature branch
+- Updating an existing PR's title or description to match conventions
+
+## Prerequisites
+
+- `gh` CLI authenticated (`gh auth status`)
+
+## Commands
+
+**Create:**
+
+```bash
+gh pr create --repo penpot/penpot --title "<TITLE>" --body-file /tmp/pr-body.md
+```
+
+**Update:**
+
+```bash
+gh pr edit <NUMBER> --repo penpot/penpot --title "<TITLE>" --body-file /tmp/pr-body.md
+```
+
+**Verify:**
+
+```bash
+gh pr view <NUMBER> --repo penpot/penpot --json title,body
+```
@@ -9,11 +9,6 @@ metadata: {"clawdbot":{"emoji":"📂","requires":{"bins":["fd"]},"install":[{"id

 User-friendly alternative to `find` with smart defaults.

-## When to use
-
- Locating files or directories by name or pattern — prefer it over
-  plain `find`: simpler syntax, smart defaults, respects `.gitignore`.
-
 ## Quick Start

 ### Basic search
@@ -9,11 +9,6 @@ metadata: {"clawdbot":{"emoji":"🔍","requires":{"bins":["jq"]},"install":[{"id

 Process, filter, and transform JSON data with jq.

-## When to use
-
- Parsing, filtering, or transforming JSON from commands, files, or API
-  responses — slicing, reshaping, or validating JSON output.
-
 ## Quick Examples

 ### Basic filtering
@@ -10,12 +10,6 @@ Evaluate Clojure (or ClojureScript) code via a running nREPL server using

 Full documentation: `mem:scripts/nrepl-eval` (file: `.serena/memories/scripts/nrepl-eval.md`)

-## When to use
-
- Evaluating Clojure or ClojureScript code against the running nREPL
-  sessions (backend 6064, frontend 3447) — live inspection, patching, or
-  debugging.
-
 ## Quick Reference

 ```bash
@@ -1,9 +1,9 @@
 ---
-name: plan-review-criteria
-description: Plan review criteria — the six review axes, severity rubric, approval standard, and output format for reviewing implementation plans. Loaded by the reviewer subagent of the review-plan flow. Not a user-facing flow — to review a plan, use the review-plan flow.
+name: plan-review
+description: Reviews implementation plans for quality, completeness, and actionability. Use after a plan is produced by the planner skill, before starting implementation. Use when evaluating a plan written by yourself, another agent, or a human.
 ---

-# Plan Review Criteria
+# Plan Review

 ## Overview

@@ -13,10 +13,10 @@ Multi-dimensional plan review with quality gates. Every plan gets reviewed befor

 ## When to Use

- The reviewer subagent of the `review-plan` flow loads this skill to perform
-  the review of a plan.
- To review a plan, always go through the `review-plan` flow — never load this
-  skill directly for that. This is the criteria reference, not the flow.
+- After the planner skill produces a plan
+- Before starting implementation on any non-trivial task
+- When reviewing a plan written by another agent or a human
+- When a plan feels too large, vague, or risky to start

 **Do NOT use for:** Single-file changes with obvious scope, or when the task is trivial enough to just do.

@@ -87,7 +87,7 @@ Can an implementer actually execute this?

 ### 6. Proposed Code Quality *(when the plan includes implementation details)*

-If the plan proposes code shapes, function signatures, data structures, or API designs, evaluate those proposals against `code-review-criteria`:
+If the plan proposes code shapes, function signatures, data structures, or API designs, evaluate those proposals against `code-review` criteria:

 - **Correctness:** Do the proposed types/signatures handle edge cases (null, empty, boundaries)?
 - **Readability:** Are proposed names descriptive and consistent with project conventions?
@@ -215,7 +215,7 @@ Check that the plan can actually confirm it worked:
 If the plan includes code snippets, types, or API designs:

 ```
- Load code-review-criteria skill for criteria
+- Load code-review skill for criteria
 - Check proposed signatures for edge cases
 - Verify naming follows project conventions
 - Confirm abstractions follow existing patterns
@@ -310,6 +310,6 @@ If the plan includes code snippets, types, or API designs:
 ## See Also

 - For producing plans, use the `planner` skill
- For reviewing implemented code, use `code-review-criteria` — also the criteria source for axis 6
+- For reviewing implemented code, use `code-review` — also the criteria source for axis 6
 - For security-specific concerns, see `security-and-hardening`
 - For testing strategy guidance, see `testing`
@@ -1,6 +1,6 @@
 ---
 name: planner
-description: Read-only planning and architecture analysis for Penpot — produce a structured implementation plan with task breakdown, acceptance criteria, sizing, and checkpoints. Always output to the user with the plan's save path (saved or suggested) and the next steps.
+description: Read-only planning and architecture analysis for Penpot — produce a structured implementation plan with task breakdown, acceptance criteria, sizing, and checkpoints. Always output to the user and save to .opencode/plans/YYYY-MM-DD-<title>.md.
 ---

 # Planner
@@ -215,9 +215,9 @@ Add explicit checkpoints with the relevant module commands:

 ## Constraints

- You are **analysis-only** — never create, edit, or delete source code. The
-  only file you may write is the plan itself, and only when the command or
-  user explicitly instructs you to save it.
+- You are **analysis-only** — never create, edit, or delete source code.
+- The only file write you may attempt is the plan itself, saved to
+  `.opencode/plans/`.
 - You do **not** run builds, tests, linters, or any commands that modify state.
 - You do **not** create git commits or interact with version control.
 - You do **not** execute shell commands beyond read-only searches (`rg`, `ls`,
@@ -228,23 +228,22 @@ Add explicit checkpoints with the relevant module commands:
 ## Output Format

 The plan is always delivered in the response so the user sees it regardless
-of which agent is running the skill. By default you never write the plan file;
-announce the path instead. Write the file only when the command or user
-explicitly instructs you to save it — and then only that file.
+of which agent is running the skill.

-Announce the suggested save path:
+Additionally, save the plan to:

 ```
-.agents/plans/YYYY-MM-DD-<plan-one-line-title>.md
+.opencode/plans/YYYY-MM-DD-<plan-one-line-title>.md
 ```

 Use today's date in the user's local timezone. The `<plan-one-line-title>`
 slug is lowercase, hyphen-separated, and a short summary of the task
-(e.g. `add-batch-get-profiles-for-file-comments`). If the user explicitly
-provides a target file path, announce that path instead of the default.
+(e.g. `add-batch-get-profiles-for-file-comments`). Create the
+`.opencode/plans/` directory if it does not exist.

-End the response by suggesting the next steps: `/review-plan` to get a second
-opinion on the plan and `/implement-plan` to execute it.
+IMPORTANT: The plan agent has write permission specifically for
+`.opencode/plans/` — always attempt the write. If the user explicitly provides
+a target file path, use that path instead of the default.

 ### Plan Document Template

@@ -375,6 +374,4 @@ Before delivering the plan, confirm:
 - [ ] Task dependencies are identified and ordered correctly
 - [ ] No task is XL or larger — break it down instead
 - [ ] Checkpoints exist after every 2-3 tasks
- [ ] The response states the plan's path (saved or suggested) and suggests
-      `/review-plan` and `/implement-plan`
 - [ ] The plan is ready for human review
@@ -9,11 +9,6 @@ metadata: {"clawdbot":{"emoji":"🔎","requires":{"bins":["rg"]},"install":[{"id

 Fast, smart recursive search. Respects `.gitignore` by default.

-## When to use
-
- Searching file contents across the repo for regex patterns — the
-  default code search, respects `.gitignore`.
-
 ## Quick Start

 ### Basic search
@@ -9,13 +9,6 @@ Apply the ASD-STE100 standard to all prose you produce in this task. Do not anno

 Compliance note (for you, not for output): the official specification and its dictionary are copyright ASD. This skill encodes paraphrased rules and a publicly sourced word list. For certified aerospace/defense deliverables, tell the user that full compliance requires the free official specification (asd-ste100.org) and a human sign-off. Never claim certified compliance.

-## When to use
-
-Only when the user explicitly invokes it: they type `/ste`, or say "use
-the ste skill" / "apply ASD-STE100". Requests like "simplify this",
-"make it clearer", or "shorter sentences" do NOT invoke it — respond
-normally unless it is named.
-
 ## Step 0 — Classify the text

 Before writing a single sentence, decide: is this **procedural** text (instructions someone follows) or **descriptive** text (explanation, background, description)? Every limit below depends on this. Mixed documents get classified section by section.
@@ -11,12 +11,6 @@ Fetch information from Taiga public API for the **Penpot** project

 **No authentication required** — only public project data is accessed.

-## When to use
-
- The user asks about Penpot issues, user stories, or tasks tracked in
-  Taiga — fetch them via the public API (project id 345963), no
-  authentication needed.
-
 ## Prerequisites

 - `python3` — the `scripts/taiga.py` CLI script is self-contained (stdlib only)
@@ -15,7 +15,6 @@ You are working on the GitHub project `penpot/penpot`, a monorepo.
  - Before `gh issue create` → `mem:workflow/creating-issues` (title derivation, body template, labels, Issue Type)
  - Before `gh pr create` / `gh pr edit` → `mem:workflow/creating-prs` (title format, body structure, "Note:" line)
 - **Never `git push`, force-push, or modify `git origin`** (or any other remote). The user pushes from their own shell; if a push is required, say so and wait. Never amend a commit that the user has already pushed unless explicitly asked.
- **Never edit `CHANGES.md` by hand.** The changelog is generated from GitHub milestones during the release process; update it only via the `update-changelog` skill flow or on explicit user request.
 - You have access to the GitHub CLI `gh` or corresponding MCP tools.
 - Issues are also managed on Taiga. Read issues using the `read_taiga_issue` tool.
 - Before writing code, analyze the task in depth and describe your plan. If the task is complex, break it down into atomic steps.
@@ -351,5 +351,5 @@ gh issue view <NUMBER> --repo penpot/penpot --json title
 ## See Also

 - End-to-end orchestration entry point: the `create-issue` skill at
-  `.agents/skills/create-issue/SKILL.md`. The skill is a thin entry
+  `.opencode/skills/create-issue/SKILL.md`. The skill is a thin entry
  point; this memory is the canonical home for all issue-creation rules.
@@ -8,9 +8,6 @@
  wait for the user to push. Do not change the remote URL, do not switch SSH↔HTTPS.
 - **Never amend a commit that has been pushed** unless the user explicitly asks.
  If the user pushes, treat that commit as final from the agent's side.
- **Never edit `CHANGES.md` by hand** in commits or PRs. The changelog is
-  generated from GitHub milestones during the release process; update it only
-  via the `update-changelog` skill flow or on explicit user request.
 - **Never pipe test output directly to filters** (`| head`, `| tail`, `| grep`, etc.).
  Always redirect to a file first: `command > /tmp/output.txt 2>&1`, then read/grep the file.
  This prevents hiding test failures. See `mem:testing` for details.
@@ -1,3 +0,0 @@
-Read and follow the instructions in `AGENTS.md`.
-
-Treat `AGENTS.md` as the canonical project instruction file.
@@ -15,6 +15,7 @@
  (:require
   [app.common.schema :as sm]
   [app.util.ssrf :as ssrf]
+   [app.worker :as-alias wrk]
   [cuerdas.core :as str]
   [integrant.core :as ig]
   [java-http-clj.core :as http])
@@ -23,6 +24,8 @@
   java.net.URI))

 (def default-max-redirects 5)
+(def default-connect-timeout 30000)
+(def default-request-timeout 30000)

 (defn client?
  [o]
@@ -33,15 +36,17 @@
  :pred client?})

 (defmethod ig/init-key ::client
-  [_ _]
-  (http/build-client {:connect-timeout 30000
+  [_ {:keys [::wrk/executor]}]
+  (http/build-client {:connect-timeout default-connect-timeout
+                      :executor executor
                      :follow-redirects :never}))

 (defn send!
  ([client req] (send! client req {}))
  ([client req {:keys [response-type] :or {response-type :string}}]
   (assert (client? client) "expected valid http client")
-   (http/send req {:client client :as response-type})))
+   (http/send (merge {:timeout default-request-timeout} req)
+              {:client client :as response-type})))

 (defn- resolve-client
  [params]
@@ -200,7 +200,7 @@
   {::db/pool (ig/ref ::db/pool)}

   ::http.client/client
-   {}
+   {::wrk/executor (ig/ref ::wrk/executor)}

   ::session/manager
   {::db/pool (ig/ref ::db/pool)}
@@ -75,10 +75,10 @@
                           {:method method
                            :uri uri
                            :body body
-                            :headers headers}
+                            :headers headers
+                            :timeout timeout}
                           {:response-type :input-stream
-                            :skip-ssrf-check? true
-                            :timeout timeout})
+                            :skip-ssrf-check? true})
            status (:status resp)]
        (when (not (<= 200 status 299))
          (let [body (:body resp)]
@@ -68,8 +68,7 @@
                                 "x-profile-id" (str profile-id)}
                       :uri uri
                       :version :http1.1}
-                (= method :post) (assoc :body (json/encode request-params :key-fn json/write-camel-key)))
-              {:skip-ssrf-check? true})))
+                (= method :post) (assoc :body (json/encode request-params :key-fn json/write-camel-key))))))

 (defn- with-retries
  [handler max-retries]
@@ -0,0 +1,30 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns backend-tests.http-client-test
+  (:require
+   [app.http.client :as http]
+   [clojure.test :as t]
+   [java-http-clj.core :as jhttp]
+   [mockery.core :refer [with-mocks]]))
+
+(t/deftest send-injects-default-timeout-when-absent
+  (with-mocks [mock {:target 'java-http-clj.core/send
+                     :return {:status 200 :body ""}}]
+    (let [client (jhttp/build-client {})]
+      (http/send! client {:method :get :uri "https://example.com/"})
+      (let [[req _opts] (:call-args @mock)]
+        (t/is (= http/default-request-timeout (:timeout req)))))))
+
+(t/deftest send-preserves-caller-supplied-timeout
+  (with-mocks [mock {:target 'java-http-clj.core/send
+                     :return {:status 200 :body ""}}]
+    (let [client (jhttp/build-client {})]
+      (http/send! client {:method :get
+                          :uri "https://example.com/"
+                          :timeout 5000})
+      (let [[req _opts] (:call-args @mock)]
+        (t/is (= 5000 (:timeout req)))))))
@@ -8,6 +8,7 @@
  (:require
   [app.common.exceptions :as ex]
   [app.config :as cf]
+   [app.http.client :as http]
   [app.media.remote :as media.remote]
   [app.setup :as-alias setup]
   [app.util.json :as json]
@@ -500,6 +501,22 @@
                     :headers {}})]
          (t/is (= 200 (:status resp))))))))

+(t/deftest service-request-puts-configured-timeout-in-request
+  (t/testing "service-request puts media-processing-service-timeout on the http request"
+    (let [captured (atom nil)]
+      (with-redefs [cf/get (th/config-get-mock config-mock)
+                    http/req (fn [_client request _opts]
+                               (reset! captured request)
+                               {:status 200
+                                :body (json-stream {:width 100 :height 100})})]
+        (media.remote/service-request
+         (mk-system)
+         {:method :post
+          :uri "http://localhost:6065/api/image/info"
+          :body nil
+          :headers {}})
+        (t/is (= 5000 (:timeout @captured)))))))
+
 ;; ---------------------------------------------------------------------------
 ;; Shared key
 ;; ---------------------------------------------------------------------------
@@ -0,0 +1,70 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC Sucursal en España SL
+
+(ns backend-tests.nitrate-ssrf-test
+  (:require
+   [app.config :as cf]
+   [app.http.client :as http]
+   [app.nitrate :as nitrate]
+   [app.setup :as-alias setup]
+   [clojure.string :as str]
+   [clojure.test :as t]
+   [integrant.core :as ig]
+   [java-http-clj.core :as jhttp]))
+
+(def ^:private private-admin-uri "http://127.0.0.1:9090")
+
+(defn- mk-cfg
+  "Minimal nitrate cfg with a real HttpClient and nitrate client methods."
+  []
+  (let [http-client (jhttp/build-client {})
+        base        {::http/client http-client
+                     ::setup/shared-keys {:admin-console "test-shared-key"}}]
+    (assoc base ::nitrate/client (ig/init-key ::nitrate/client base))))
+
+(defn- with-admin-console-uri
+  "Run `f` with :admin-console enabled and the given admin-console URI / allowlist."
+  [admin-uri allowed-hosts f]
+  (let [original-get cf/get]
+    (with-redefs [cf/flags #{:admin-console}
+                  cf/get (fn [key & args]
+                           (case key
+                             :admin-console-uri admin-uri
+                             :ssrf-allowed-hosts allowed-hosts
+                             (apply original-get key args)))]
+      (f))))
+
+(t/deftest nitrate-blocks-private-admin-console-uri
+  (let [sent? (atom false)]
+    (with-admin-console-uri
+      private-admin-uri
+      #{}
+      (fn []
+        (with-redefs [jhttp/send (fn [_req _opts]
+                                   (reset! sent? true)
+                                   {:status 200 :body "{\"licenses\":true}"})]
+          (try
+            (nitrate/call (mk-cfg) :connectivity {})
+            (t/is false "should have raised :nitrate-unavailable")
+            (catch Exception e
+              (t/is (= :nitrate-unavailable (:type (ex-data e))))
+              (t/is (false? @sent?)
+                    "SSRF must stop the request before it reaches the network"))))))))
+
+(t/deftest nitrate-proceeds-when-admin-console-host-allowlisted
+  (let [captured (atom nil)]
+    (with-admin-console-uri
+      private-admin-uri
+      #{"127.0.0.1"}
+      (fn []
+        (with-redefs [jhttp/send (fn [req _opts]
+                                   (reset! captured req)
+                                   {:status 200
+                                    :body "{\"licenses\":true}"})]
+          (let [result (nitrate/call (mk-cfg) :connectivity {})]
+            (t/is (= {:licenses true} result))
+            (t/is (some? @captured))
+            (t/is (str/starts-with? (str (:uri @captured)) private-admin-uri))))))))
@@ -714,8 +714,10 @@
 (defn remove-interaction
  [interactions index]
  (let [interactions (or interactions [])]
-    (into (subvec interactions 0 index)
-          (subvec interactions (inc index)))))
+    (if (and (>= index 0) (< index (count interactions)))
+      (into (subvec interactions 0 index)
+            (subvec interactions (inc index)))
+      interactions)))

 (defn update-interaction
  [interactions index update-fn]
@@ -861,6 +861,37 @@
        (t/is (= (:action-type (last new-interactions)) :open-url))))))


+(t/deftest remove-interaction-bounds-check
+  (let [i1 (ctsi/set-action-type ctsi/default-interaction :open-overlay)
+        i2 (ctsi/set-action-type ctsi/default-interaction :close-overlay)
+        i3 (ctsi/set-action-type ctsi/default-interaction :prev-screen)
+        interactions [i1 i2 i3]]
+
+    (t/testing "Remove interaction with valid index"
+      (let [new-interactions (ctsi/remove-interaction interactions 1)]
+        (t/is (= 2 (count new-interactions)))
+        (t/is (= :open-overlay (:action-type (first new-interactions))))
+        (t/is (= :prev-screen (:action-type (second new-interactions))))))
+
+    (t/testing "Remove interaction with index out of bounds (too high)"
+      (let [new-interactions (ctsi/remove-interaction interactions 10)]
+        (t/is (= 3 (count new-interactions)))
+        (t/is (= interactions new-interactions))))
+
+    (t/testing "Remove interaction with negative index"
+      (let [new-interactions (ctsi/remove-interaction interactions -1)]
+        (t/is (= 3 (count new-interactions)))
+        (t/is (= interactions new-interactions))))
+
+    (t/testing "Remove interaction from empty vector"
+      (let [new-interactions (ctsi/remove-interaction [] 0)]
+        (t/is (= 0 (count new-interactions)))))
+
+    (t/testing "Remove interaction from nil"
+      (let [new-interactions (ctsi/remove-interaction nil 0)]
+        (t/is (= 0 (count new-interactions)))))))
+
+
 (t/deftest remap-interactions
  (let [frame1 (cts/setup-shape {:type :frame})
        frame2 (cts/setup-shape {:type :frame})
@@ -1,349 +0,0 @@
-{
-  "~:features": {
-    "~#set": [
-      "fdata/path-data",
-      "plugins/runtime",
-      "design-tokens/v1",
-      "layout/grid",
-      "styles/v2",
-      "fdata/pointer-map",
-      "fdata/objects-map",
-      "components/v2",
-      "fdata/shape-data-type",
-      "text-editor/v2"
-    ]
-  },
-  "~:team-id": "~u9e6e22b2-db76-81d6-8006-75d7cdbb8bad",
-  "~:permissions": {
-    "~:type": "~:membership",
-    "~:is-owner": true,
-    "~:is-admin": true,
-    "~:can-edit": true,
-    "~:can-read": true,
-    "~:is-logged": true
-  },
-  "~:has-media-trimmed": false,
-  "~:comment-thread-seqn": 0,
-  "~:name": "Fixed size text",
-  "~:revn": 3,
-  "~:modified-at": "~m1753957736516",
-  "~:vern": 0,
-  "~:id": "~u238a17e0-75ff-8075-8006-934586ea2230",
-  "~:is-shared": false,
-  "~:migrations": {
-    "~#ordered-set": [
-      "legacy-2",
-      "legacy-3",
-      "legacy-5",
-      "legacy-6",
-      "legacy-7",
-      "legacy-8",
-      "legacy-9",
-      "legacy-10",
-      "legacy-11",
-      "legacy-12",
-      "legacy-13",
-      "legacy-14",
-      "legacy-16",
-      "legacy-17",
-      "legacy-18",
-      "legacy-19",
-      "legacy-25",
-      "legacy-26",
-      "legacy-27",
-      "legacy-28",
-      "legacy-29",
-      "legacy-31",
-      "legacy-32",
-      "legacy-33",
-      "legacy-34",
-      "legacy-36",
-      "legacy-37",
-      "legacy-38",
-      "legacy-39",
-      "legacy-40",
-      "legacy-41",
-      "legacy-42",
-      "legacy-43",
-      "legacy-44",
-      "legacy-45",
-      "legacy-46",
-      "legacy-47",
-      "legacy-48",
-      "legacy-49",
-      "legacy-50",
-      "legacy-51",
-      "legacy-52",
-      "legacy-53",
-      "legacy-54",
-      "legacy-55",
-      "legacy-56",
-      "legacy-57",
-      "legacy-59",
-      "legacy-62",
-      "legacy-65",
-      "legacy-66",
-      "legacy-67",
-      "0001-remove-tokens-from-groups",
-      "0002-normalize-bool-content-v2",
-      "0002-clean-shape-interactions",
-      "0003-fix-root-shape",
-      "0003-convert-path-content-v2",
-      "0004-clean-shadow-color",
-      "0005-deprecate-image-type",
-      "0006-fix-old-texts-fills",
-      "0007-clear-invalid-strokes-and-fills-v2",
-      "0008-fix-library-colors-v4",
-      "0009-clean-library-colors",
-      "0009-add-partial-text-touched-flags"
-    ]
-  },
-  "~:version": 67,
-  "~:project-id": "~u9e6e22b2-db76-81d6-8006-75d7cdc30669",
-  "~:created-at": "~m1753957644225",
-  "~:data": {
-    "~:pages": [
-      "~u238a17e0-75ff-8075-8006-934586ea2231"
-    ],
-    "~:pages-index": {
-      "~u238a17e0-75ff-8075-8006-934586ea2231": {
-        "~:objects": {
-          "~u00000000-0000-0000-0000-000000000000": {
-            "~#shape": {
-              "~:y": 0,
-              "~:hide-fill-on-export": false,
-              "~:transform": {
-                "~#matrix": {
-                  "~:a": 1.0,
-                  "~:b": 0.0,
-                  "~:c": 0.0,
-                  "~:d": 1.0,
-                  "~:e": 0.0,
-                  "~:f": 0.0
-                }
-              },
-              "~:rotation": 0,
-              "~:name": "Root Frame",
-              "~:width": 0.01,
-              "~:type": "~:frame",
-              "~:points": [
-                {
-                  "~#point": {
-                    "~:x": 0.0,
-                    "~:y": 0.0
-                  }
-                },
-                {
-                  "~#point": {
-                    "~:x": 0.01,
-                    "~:y": 0.0
-                  }
-                },
-                {
-                  "~#point": {
-                    "~:x": 0.01,
-                    "~:y": 0.01
-                  }
-                },
-                {
-                  "~#point": {
-                    "~:x": 0.0,
-                    "~:y": 0.01
-                  }
-                }
-              ],
-              "~:r2": 0,
-              "~:proportion-lock": false,
-              "~:transform-inverse": {
-                "~#matrix": {
-                  "~:a": 1.0,
-                  "~:b": 0.0,
-                  "~:c": 0.0,
-                  "~:d": 1.0,
-                  "~:e": 0.0,
-                  "~:f": 0.0
-                }
-              },
-              "~:r3": 0,
-              "~:r1": 0,
-              "~:id": "~u00000000-0000-0000-0000-000000000000",
-              "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
-              "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
-              "~:strokes": [],
-              "~:x": 0,
-              "~:proportion": 1.0,
-              "~:r4": 0,
-              "~:selrect": {
-                "~#rect": {
-                  "~:x": 0,
-                  "~:y": 0,
-                  "~:width": 0.01,
-                  "~:height": 0.01,
-                  "~:x1": 0,
-                  "~:y1": 0,
-                  "~:x2": 0.01,
-                  "~:y2": 0.01
-                }
-              },
-              "~:fills": [
-                {
-                  "~:fill-color": "#FFFFFF",
-                  "~:fill-opacity": 1
-                }
-              ],
-              "~:flip-x": null,
-              "~:height": 0.01,
-              "~:flip-y": null,
-              "~:shapes": [
-                "~ucc6f0580-449c-8019-8006-9345db077fa0"
-              ]
-            }
-          },
-          "~ucc6f0580-449c-8019-8006-9345db077fa0": {
-            "~#shape": {
-              "~:y": 150,
-              "~:transform": {
-                "~#matrix": {
-                  "~:a": 1.0,
-                  "~:b": 0.0,
-                  "~:c": 0.0,
-                  "~:d": 1.0,
-                  "~:e": 0.0,
-                  "~:f": 0.0
-                }
-              },
-              "~:rotation": 0,
-              "~:grow-type": "~:fixed",
-              "~:content": {
-                "~:type": "root",
-                "~:key": "1s4am1jl24s",
-                "~:children": [
-                  {
-                    "~:type": "paragraph-set",
-                    "~:children": [
-                      {
-                        "~:line-height": "1.2",
-                        "~:font-style": "normal",
-                        "~:children": [
-                          {
-                            "~:line-height": "1.2",
-                            "~:font-style": "normal",
-                            "~:typography-ref-id": null,
-                            "~:text-transform": "none",
-                            "~:font-id": "sourcesanspro",
-                            "~:key": "13p0zwl2yhc",
-                            "~:font-size": "14",
-                            "~:font-weight": "400",
-                            "~:typography-ref-file": null,
-                            "~:font-variant-id": "regular",
-                            "~:text-decoration": "none",
-                            "~:letter-spacing": "0",
-                            "~:fills": [
-                              {
-                                "~:fill-color": "#000000",
-                                "~:fill-opacity": 1
-                              }
-                            ],
-                            "~:font-family": "sourcesanspro",
-                            "~:text": "Lorem ipsum"
-                          }
-                        ],
-                        "~:typography-ref-id": null,
-                        "~:text-transform": "none",
-                        "~:text-align": "left",
-                        "~:font-id": "sourcesanspro",
-                        "~:key": "20hf3kmyoub",
-                        "~:font-size": "14",
-                        "~:font-weight": "400",
-                        "~:typography-ref-file": null,
-                        "~:text-direction": "ltr",
-                        "~:type": "paragraph",
-                        "~:font-variant-id": "regular",
-                        "~:text-decoration": "none",
-                        "~:letter-spacing": "0",
-                        "~:fills": [
-                          {
-                            "~:fill-color": "#000000",
-                            "~:fill-opacity": 1
-                          }
-                        ],
-                        "~:font-family": "sourcesanspro"
-                      }
-                    ]
-                  }
-                ],
-                "~:vertical-align": "top"
-              },
-              "~:hide-in-viewer": false,
-              "~:name": "Fixed text",
-              "~:width": 300,
-              "~:type": "~:text",
-              "~:points": [
-                {
-                  "~#point": {
-                    "~:x": 200,
-                    "~:y": 150
-                  }
-                },
-                {
-                  "~#point": {
-                    "~:x": 500,
-                    "~:y": 150
-                  }
-                },
-                {
-                  "~#point": {
-                    "~:x": 500,
-                    "~:y": 350
-                  }
-                },
-                {
-                  "~#point": {
-                    "~:x": 200,
-                    "~:y": 350
-                  }
-                }
-              ],
-              "~:transform-inverse": {
-                "~#matrix": {
-                  "~:a": 1.0,
-                  "~:b": 0.0,
-                  "~:c": 0.0,
-                  "~:d": 1.0,
-                  "~:e": 0.0,
-                  "~:f": 0.0
-                }
-              },
-              "~:id": "~ucc6f0580-449c-8019-8006-9345db077fa0",
-              "~:parent-id": "~u00000000-0000-0000-0000-000000000000",
-              "~:frame-id": "~u00000000-0000-0000-0000-000000000000",
-              "~:x": 200,
-              "~:selrect": {
-                "~#rect": {
-                  "~:x": 200,
-                  "~:y": 150,
-                  "~:width": 300,
-                  "~:height": 200,
-                  "~:x1": 200,
-                  "~:y1": 150,
-                  "~:x2": 500,
-                  "~:y2": 350
-                }
-              },
-              "~:flip-x": null,
-              "~:height": 200,
-              "~:flip-y": null
-            }
-          }
-        },
-        "~:id": "~u238a17e0-75ff-8075-8006-934586ea2231",
-        "~:name": "Page 1"
-      }
-    },
-    "~:id": "~u238a17e0-75ff-8075-8006-934586ea2230",
-    "~:options": {
-      "~:components-v2": true,
-      "~:base-font-size": "16px"
-    }
-  }
-}
@@ -9,9 +9,7 @@ const FILE = {
 test.beforeEach(async ({ page }) => {
  await WasmWorkspacePage.init(page);
  // WASM_FLAGS already enables render-wasm; add the WASM text editor on top.
-  await WasmWorkspacePage.mockConfigFlags(page, [
-    "enable-feature-text-editor-wasm",
-  ]);
+  await WasmWorkspacePage.mockConfigFlags(page, ["enable-feature-text-editor-wasm"]);
 });

 async function openEditorAndSelectAll(workspace) {
@@ -24,12 +22,12 @@ async function openEditorAndSelectAll(workspace) {
 }

 test.describe("BUG 10502 - Mixed families and variants", () => {
-  test("Multiple variants of the same font family", async ({ page }) => {
+  test("Multiple variants of the same font family", async ({
+    page,
+  }) => {
    const workspace = new WasmWorkspacePage(page, { textEditor: true });
    await workspace.setupEmptyFile();
-    await workspace.mockGetFile(
-      "text-editor/get-file-10502-mixed-variants.json",
-    );
+    await workspace.mockGetFile("text-editor/get-file-10502-mixed-variants.json");

    await workspace.goToWorkspace(FILE);
    await workspace.waitForFirstRender();
@@ -49,14 +47,10 @@ test.describe("BUG 10502 - Mixed families and variants", () => {
    await expect(fontVariant).toHaveText("--");
  });

-  test("Mixed font families appear as such in the dropdown", async ({
-    page,
-  }) => {
+  test("Mixed font families appear as such in the dropdown", async ({ page }) => {
    const workspace = new WasmWorkspacePage(page, { textEditor: true });
    await workspace.setupEmptyFile();
-    await workspace.mockGetFile(
-      "text-editor/get-file-10502-mixed-families.json",
-    );
+    await workspace.mockGetFile("text-editor/get-file-10502-mixed-families.json");
    // Serve a stand-in TTF for Sora so the render doesn't wait on a real fetch.
    // Glyphs are irrelevant here: the assertion only inspects the sidebar.
    await workspace.mockGoogleFont("sora", "render-wasm/assets/ebgaramond.ttf");
@@ -153,94 +147,9 @@ test("BUG 10531 - Entering the editor auto-selects the whole text", async ({
  await workspace.copy("keyboard");

  // Assert the text was copied correctly
-  const copiedText = await page.evaluate(() => navigator.clipboard.readText());
+  const copiedText = await page.evaluate(() =>
+    navigator.clipboard.readText(),
+  );
  expect(copiedText).toBe("Lorem ipsum");
 });

-test.describe("BUG 10934 - Double-clicking a text side handle sets auto-size", () => {
-  // Sets up the workspace and loads a text shape whose size is larger than its text
-  async function setupFixedSizeText(page) {
-    const workspace = new WasmWorkspacePage(page, { textEditor: true });
-    // Enable token inputs so they use the new component with accessible DOM
-    await workspace.mockConfigFlags(["enable-feature-token-input"]);
-    await workspace.setupEmptyFile();
-    await workspace.mockGetFile("text-editor/get-file-fixed-size-text.json");
-    await workspace.goToWorkspace();
-    await workspace.waitForFirstRender();
-
-    // Select the text and zoom to fit, so it is fully visible in the viewport
-    await workspace.clickLeafLayer("Fixed text");
-    await page.keyboard.press("Shift+1");
-    await workspace.waitForIdle();
-
-    return workspace;
-  }
-
-  async function doubleClickSideHandle(workspace, position) {
-    const handle = workspace.viewport.getByTestId(
-      `resize-side-handler-${position}`,
-    );
-    await handle.waitFor();
-    const box = await handle.boundingBox();
-    await workspace.page.mouse.dblclick(
-      box.x + box.width / 2,
-      box.y + box.height / 2,
-    );
-  }
-
-  function measureInput(workspace, name) {
-    return workspace.rightSidebar
-      .getByRole("region", { name: "shape-measures-section" })
-      .getByRole("textbox", { name, exact: true });
-  }
-
-  test("Double-clicking the right handle switches to auto-width", async ({
-    page,
-  }) => {
-    const workspace = await setupFixedSizeText(page);
-
-    const widthInput = workspace.rightSidebar
-      .getByRole("region", { name: "shape-measures-section" })
-      .getByRole("textbox", { name: "Width", exact: true });
-    const initialWidth = Number(await widthInput.inputValue());
-
-    await doubleClickSideHandle(workspace, "right");
-
-    // Assert auto-width is selected and that the width has shrunk. The resize
-    // is debounced, so poll the value (auto-retrying) rather than reading once.
-    await expect(
-      workspace.rightSidebar.getByRole("button", {
-        name: "Auto width",
-        pressed: true,
-      }),
-    ).toBeVisible();
-    await expect
-      .poll(async () => Number(await widthInput.inputValue()))
-      .toBeLessThan(initialWidth);
-  });
-
-  test("Double-clicking the bottom handle switches to auto-height", async ({
-    page,
-  }) => {
-    const workspace = await setupFixedSizeText(page);
-
-    const heightInput = workspace.rightSidebar
-      .getByRole("region", { name: "shape-measures-section" })
-      .getByRole("textbox", { name: "Height", exact: true });
-    const initialHeight = Number(await heightInput.inputValue());
-
-    await doubleClickSideHandle(workspace, "bottom");
-
-    // Assert auto-height is selected and that the height has shrunk. The resize
-    // is debounced, so poll the value (auto-retrying) rather than reading once.
-    await expect(
-      workspace.rightSidebar.getByRole("button", {
-        name: "Auto height",
-        pressed: true,
-      }),
-    ).toBeVisible();
-    await expect
-      .poll(async () => Number(await heightInput.inputValue()))
-      .toBeLessThan(initialHeight);
-  });
-});
@@ -123,8 +123,7 @@
 (defn- await-font-faces
  "Waits for missing WASM faces, then resizes the affected texts."
  [stream face-keys ids]
-  (let [resize-opts   {:stack-undo? true :undo-transation? false}
-        resize-stream (->> (rx/from ids) (rx/map #(dwwt/resize-wasm-text % resize-opts)))]
+  (let [resize-stream (->> (rx/from ids) (rx/map dwwt/resize-wasm-text))]
    (if (empty? face-keys)
      resize-stream
      (->> (rx/merge wasm.fonts/font-stored-stream
@@ -79,26 +79,20 @@

 (defn resize-wasm-text
  "Resize a single text shape (auto-width/auto-height) by id.
-  No-op if the id is not a text shape or is :fixed.
-  `opts` are forwarded to `apply-wasm-modifiers`, so a caller whose undo
-  transaction is already closed when the resize lands can still get the
-  geometry into the right undo entry."
-  ([id]
-   (resize-wasm-text id nil))
-  ([id opts]
-   (ptk/reify ::resize-wasm-text
-     ptk/WatchEvent
-     (watch [_ state _]
-       (let [objects (dsh/lookup-page-objects state)
-             shape   (get objects id)
-             apply-opts (or opts {})
-             resize-stream
-             (if (and (some? shape)
-                      (cfh/text-shape? shape)
-                      (not= :fixed (:grow-type shape)))
-               (rx/of (dwm/apply-wasm-modifiers (resize-wasm-text-modifiers shape) apply-opts))
-               (rx/empty))]
-         (wrf/with-pending :text-resize [id] resize-stream))))))
+  No-op if the id is not a text shape or is :fixed."
+  [id]
+  (ptk/reify ::resize-wasm-text
+    ptk/WatchEvent
+    (watch [_ state _]
+      (let [objects (dsh/lookup-page-objects state)
+            shape   (get objects id)
+            resize-stream
+            (if (and (some? shape)
+                     (cfh/text-shape? shape)
+                     (not= :fixed (:grow-type shape)))
+              (rx/of (dwm/apply-wasm-modifiers (resize-wasm-text-modifiers shape)))
+              (rx/empty))]
+        (wrf/with-pending :text-resize [id] resize-stream)))))

 (defn resize-wasm-text-debounce-commit
  ([]
@@ -18,9 +18,6 @@
   [app.main.data.helpers :as dsh]
   [app.main.data.workspace :as dw]
   [app.main.data.workspace.shapes :as dwsh]
-   [app.main.data.workspace.undo :as dwu]
-   [app.main.data.workspace.wasm-text :as dwwt]
-   [app.main.features :as features]
   [app.main.refs :as refs]
   [app.main.store :as st]
   [app.main.ui.context :as ctx]
@@ -29,7 +26,6 @@
   [app.util.debug :as dbg]
   [app.util.dom :as dom]
   [app.util.object :as obj]
-   [potok.v2.core :as ptk]
   [rumext.v2 :as mf]))

 (def rotation-handler-size 20)
@@ -299,23 +295,13 @@
        on-double-click
        (mf/use-fn
         (mf/deps shape-id position shape-type)
-         (fn [event]
+         (fn [_event]
           (when (= shape-type :text)
-             ;; Prevent the viewport double-click handler from entering text editor
-             (dom/stop-propagation event)
-             (let [grow-type (case position
-                               :right :auto-width
-                               :bottom :auto-height
-                               nil)]
-               (when (some? grow-type)
-                 (let [uid (js/Symbol)]
-                   (st/emit! (dwu/start-undo-transaction uid)
-                             (dwsh/update-shapes [shape-id] #(assoc % :grow-type grow-type)))
-                   ;; The WASM renderer needs an explicit reflow after the grow-type change
-                   (if (features/active-feature? @st/state "render-wasm/v1")
-                     (st/emit! (dwwt/resize-wasm-text-all [shape-id] {:undo-id uid})
-                               (ptk/data-event :layout/update {:ids [shape-id]}))
-                     (st/emit! (dwu/commit-undo-transaction uid)))))))))]
+             (cond
+               (= position :right)
+               (st/emit! (dwsh/update-shapes [shape-id] #(assoc % :grow-type :auto-width)))
+               (= position :bottom)
+               (st/emit! (dwsh/update-shapes [shape-id] #(assoc % :grow-type :auto-height)))))))]

    [:g.resize-handler
     (when ^boolean show-handler
@@ -335,7 +321,6 @@
             :height height
             :class cursor
             :data-position (name position)
-             :data-testid (dm/str "resize-side-handler-" (name position))
             :transform transform-str
             :on-pointer-down on-resize
             :on-double-click on-double-click