Skip to content

chore: sync workflow templates #5611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stranske wants to merge 1 commit into from
Closed

chore: sync workflow templates #5611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/agents-guard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
github.event_name == 'pull_request_target' &&
steps.eligibility.outputs.should-run == 'true' &&
steps.api_client_base.outputs.available != 'true'
uses: "stranske/Workflows/.github/actions/setup-api-client@c2537cc959f2ce05926c4639d25b90678abc97bc" # v1
uses: "stranske/Workflows/.github/actions/setup-api-client@d68de1904bcdbe16bfe2462b73aa18f41f8a0a47" # v1
with:
secrets: ${{ toJSON(secrets) }}
github_token: ${{ github.token }}
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
steps.eligibility.outputs.should-run == 'true' &&
github.event_name == 'pull_request' &&
steps.api_client_head.outputs.available != 'true'
uses: "stranske/Workflows/.github/actions/setup-api-client@c2537cc959f2ce05926c4639d25b90678abc97bc" # v1
uses: "stranske/Workflows/.github/actions/setup-api-client@d68de1904bcdbe16bfe2462b73aa18f41f8a0a47" # v1
with:
secrets: ${{ toJSON(secrets) }}
github_token: ${{ github.token }}
Expand Down
3 changes: 2 additions & 1 deletion scripts/orchestrator_skill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ def _require_nonempty_string(value: Any, field_name: str) -> str:


def _validate_repo(repo: str) -> str:
if "/" not in repo or repo.startswith("/") or repo.endswith("/"):
parts = repo.split("/")
if len(parts) != 2 or not all(parts):
raise OrchestratorSkillConfigError("repo must use owner/name format")
return repo

Expand Down
3 changes: 2 additions & 1 deletion scripts/reference_packs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ def _require_nonempty_string(value: Any, field_name: str) -> str:


def _validate_repo(repo: str) -> str:
if "/" not in repo or repo.startswith("/") or repo.endswith("/"):
parts = repo.split("/")
if len(parts) != 2 or not all(parts):
raise ReferencePackConfigError("repo must use owner/name format")
return repo

Expand Down
28 changes: 19 additions & 9 deletions scripts/runner_lib/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import argparse
import base64
import binascii
import contextlib
import dataclasses
import datetime as dt
import hashlib
Expand Down Expand Up @@ -356,11 +357,6 @@ def materialize_orchestrator_skill(
return None

if plan.pack:
materialize_reference_packs(
workspace_path,
reference_pack_name=plan.pack,
token=token,
)
reference_packs = _load_reference_packs_module()
snapshot = reference_packs.load_reference_packs(workspace_path)
matching = [
Expand All @@ -371,6 +367,13 @@ def materialize_orchestrator_skill(
if not matching:
raise ValueError(f"orchestrator skill reference pack not found: {plan.pack}")
checkout_path = workspace_path / matching[0].checkout_path
with contextlib.suppress(FileNotFoundError):
shutil.rmtree(checkout_path)
Comment on lines +370 to +371

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 22, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Guard checkout path before deleting pack directory

If a reference pack is named .. (it currently passes PACK_NAME_PATTERN in scripts/reference_packs.py and build_checkout_plan maps it to .reference/..) and the orchestrator skill selects that pack, this new deletion targets the workspace root. In practice shutil.rmtree(workspace/.reference/..) removes the checked-out files and then raises FileNotFoundError, which is suppressed here, so prompt assembly continues with the repo wiped. Please resolve and verify the target stays under .reference (or reject ./.. pack names) before deleting.

Useful? React with 👍 / 👎.

Comment on lines +370 to +371

@coderabbitai coderabbitai Bot Jun 22, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

Handle non-directory checkout paths during cleanup.

Line 370-Line 371 only suppresses FileNotFoundError; if checkout_path exists as a file/symlink, shutil.rmtree can still raise and break prompt assembly.

Suggested fix 
-        with contextlib.suppress(FileNotFoundError):
-            shutil.rmtree(checkout_path)
+        if checkout_path.exists():
+            if checkout_path.is_dir() and not checkout_path.is_symlink():
+                shutil.rmtree(checkout_path)
+            else:
+                checkout_path.unlink()
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scripts/runner_lib/core.py` around lines 370 - 371, The contextlib.suppress
block around shutil.rmtree(checkout_path) only suppresses FileNotFoundError, but
if checkout_path is a file or symlink rather than a directory, shutil.rmtree
will raise a different exception that won't be suppressed and will break prompt
assembly. Modify the exception handling to also suppress exceptions that occur
when checkout_path exists but is not a directory, such as NotADirectoryError and
IsADirectoryError, or alternatively add a check to verify that checkout_path is
a directory before calling shutil.rmtree.

materialize_reference_packs(
workspace_path,
reference_pack_name=plan.pack,
token=token,
)
else:
checkout_path = _materialize_single_checkout_plan(
workspace_path,
Expand Down Expand Up @@ -413,12 +416,19 @@ def assemble_prompt(
)

if context.get("materialize_orchestrator_skill"):
materialize_orchestrator_skill(
orchestrator_summary_path = materialize_orchestrator_skill(
workspace,
pack_override=context.get("orchestrator_skill_pack") or None,
enabled_override=context.get("orchestrator_skill_enabled"),
token=token,
)
else:
orchestrator_summary_raw = context.get("orchestrator_skill_summary_path")
orchestrator_summary_path = (
Path(str(orchestrator_summary_raw)) if orchestrator_summary_raw else None
)
if orchestrator_summary_path and not orchestrator_summary_path.is_absolute():
orchestrator_summary_path = workspace / orchestrator_summary_path

output_file = str(
context.get("output_file") or _prompt_output_name(provider, context.get("pr_number"))
Expand Down Expand Up @@ -448,12 +458,11 @@ def assemble_prompt(
if reference_summary.is_file():
parts.extend(["\n\n## Reference Packs\n", _read_text(reference_summary).rstrip()])

orchestrator_summary = workspace / ".reference" / "ORCHESTRATOR_SKILL.md"
if orchestrator_summary.is_file():
if orchestrator_summary_path and orchestrator_summary_path.is_file():
parts.extend(
[
"\n\n## Orchestrator Skill Context\n",
_read_text(orchestrator_summary).rstrip(),
_read_text(orchestrator_summary_path).rstrip(),
]
)

Expand Down Expand Up @@ -943,6 +952,7 @@ def _cmd_assemble(args: argparse.Namespace) -> int:
"materialize_orchestrator_skill": args.materialize_orchestrator_skill,
"orchestrator_skill_pack": args.orchestrator_skill_pack or None,
"orchestrator_skill_enabled": _parse_optional_bool(args.orchestrator_skill_enabled),
"orchestrator_skill_summary_path": os.environ.get("ORCHESTRATOR_SKILL_SUMMARY_PATH"),
"github_token": os.environ.get("GH_TOKEN") or os.environ.get("GITHUB_TOKEN"),
}
prompt = assemble_prompt(args.reference_pack_name, context, args.provider)
Expand Down
Loading