fix: consolidate skills + bump code agent timeout to 45min (#3567)

Merge monorepo-workspace-routing and safe-retry into a single
rhdh-workspace skill that adds a test scoping rule: agents must
only run tests for the affected package, never workspace-wide.
Bump code agent timeout from 35 to 45 min.

Fixes: redhat-developer/rhdh-fullsend#19

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: durandom

.fullsend/customized/agents/code.md

@@ -1,5 +1,5 @@
 ---
-# forked-from: fullsend v0.17.0 scaffold (adds monorepo-workspace-routing)
+# forked-from: fullsend v0.17.0 scaffold (adds rhdh-workspace)
 # last-synced: 2026-06-16
 name: code
 description: >-
@@ -22,7 +22,7 @@ disallowedTools: >-
 model: opus
 skills:
   - code-implementation
-  - monorepo-workspace-routing
+  - rhdh-workspace
 ---
 
 # Code Agent
@@ -111,7 +111,7 @@ Your exit state is the handoff contract:
 ## Monorepo routing
 
 This is a monorepo. Before following the implementation procedure, execute
-the `monorepo-workspace-routing` skill to navigate to the correct workspace.
+the `rhdh-workspace` skill to navigate to the correct workspace.
 All subsequent work happens from within the workspace directory.
 
 ## Detailed implementation procedure

.fullsend/customized/harness/code.yaml

@@ -43,7 +43,7 @@ host_files:
 
 skills:
   - skills/code-implementation
-  - skills/monorepo-workspace-routing
+  - skills/rhdh-workspace
 
 plugins:
   - plugins/gopls-lsp
@@ -58,4 +58,4 @@ runner_env:
   REPO_DIR: "${GITHUB_WORKSPACE}/target-repo"
   TARGET_BRANCH: "${TARGET_BRANCH}"
 
-timeout_minutes: 35
+timeout_minutes: 45

.fullsend/customized/harness/fix.yaml

@@ -16,8 +16,7 @@
 #   - image: rhdh custom image with yarn/corepack pre-installed
 #   - host_files: rhdh-toolchain.env sets COREPACK_HOME to writable /tmp/corepack
 #   - host_files: yarn-proxy.env maps OpenShell's HTTP_PROXY to YARN_HTTP_PROXY
-#   - skills: adds monorepo-workspace-routing for workspace navigation
-#   - skills: adds safe-retry to guard against infinite retry loops
+#   - skills: adds rhdh-workspace for workspace navigation + test scoping
 #   - policy: custom fix policy with yarn registry + pnpm binary allowlist
 agent: agents/fix.md
 doc: docs/agents/fix.md
@@ -54,8 +53,7 @@ host_files:
 
 skills:
   - skills/fix-review
-  - skills/monorepo-workspace-routing
-  - skills/safe-retry
+  - skills/rhdh-workspace
 
 runner_env:
   PUSH_TOKEN: "${PUSH_TOKEN}"

…ills/monorepo-workspace-routing/SKILL.md …ustomized/skills/rhdh-workspace/SKILL.md.fullsend/customized/skills/monorepo-workspace-routing/SKILL.md renamed to .fullsend/customized/skills/rhdh-workspace/SKILL.md .fullsend/customized/skills/monorepo-workspace-routing/SKILL.md renamed to .fullsend/customized/skills/rhdh-workspace/SKILL.md

@@ -1,12 +1,12 @@
 ---
-name: monorepo-workspace-routing
+name: rhdh-workspace
 description: >-
-  Navigate to the correct workspace in a monorepo before starting work.
-  Identifies the target workspace from issue/PR context and changes directory
-  so that CWD-bound tools (openspec, backstage-cli) work correctly.
+  Navigate to the correct workspace in the rhdh-plugins monorepo, install
+  dependencies, and scope all commands (test, build, lint) to the target
+  workspace. Prevents workspace-wide operations that exceed sandbox timeouts.
 ---
 
-# Monorepo Workspace Routing
+# RHDH Workspace
 
 This repository is a monorepo. Independent Backstage plugin workspaces live
 under `workspaces/<name>/`. Each workspace has its own `package.json`,
@@ -87,9 +87,33 @@ If any of these commands modify files, the changes MUST be included in your
 commit. These are not optional — CI will reject the PR if these artifacts
 are out of sync.
 
+## Test scoping
+
+Run tests ONLY for the affected package, from within the package directory:
+
+```bash
+cd plugins/<plugin-name>/
+yarn test
+```
+
+Or equivalently from the workspace root:
+
+```bash
+yarn backstage-cli package test --filter <package-name>
+```
+
+**NEVER run workspace-wide or monorepo-wide test sweeps.** Commands like
+`yarn backstage-cli package test` without a filter, or `yarn test` from the
+workspace root, execute tests for every package in the workspace. This exceeds
+the sandbox timeout and will kill your run — losing all uncommitted work.
 ## Rules
 
 - ALL build, test, lint, and validation commands must run from the workspace root
+  or the specific package directory — never from the monorepo root
 - Do not run `yarn install` from the monorepo root for workspace-specific work
 - Do not mix changes across multiple workspaces in a single commit
 - Each workspace is independent — do not assume shared dependencies
+- After a test/build/lint failure, read the full error output and fix the code
+  before retrying. Never retry the same command without changing code first
+- After 2 consecutive test failures, re-read every file you edited and diff your
+  changes against the original before running tests again