-
Notifications
You must be signed in to change notification settings - Fork 7.2k
Better handling skill depdenencies on ENV VAR. #9017
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.
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
Open
xl-openai
wants to merge
1
commit into
main
Choose a base branch
from
xl/skill
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,440
−97
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| use serde::Deserialize; | ||
|
|
||
| #[derive(Debug, Clone, PartialEq, Eq)] | ||
| pub(crate) struct SkillDependency { | ||
| pub(crate) name: String, | ||
| pub(crate) description: Option<String>, | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, PartialEq, Eq)] | ||
| pub(crate) struct SkillDependencyInfo { | ||
| pub(crate) skill_name: String, | ||
| pub(crate) dependency: SkillDependency, | ||
| } | ||
|
|
||
| #[derive(Debug, Clone, PartialEq, Eq)] | ||
| pub(crate) struct SkillDependencyResponse { | ||
| pub(crate) values: std::collections::HashMap<String, String>, | ||
| } | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| struct SkillFrontmatter { | ||
| #[serde(default)] | ||
| dependencies: Vec<SkillDependencyEntry>, | ||
| } | ||
|
|
||
| #[derive(Debug, Deserialize)] | ||
| struct SkillDependencyEntry { | ||
| #[serde(rename = "type")] | ||
| dep_type: String, | ||
| name: Option<String>, | ||
| description: Option<String>, | ||
| } | ||
|
|
||
| pub(crate) fn parse_env_var_dependencies(contents: &str) -> Vec<SkillDependency> { | ||
| let Some(frontmatter) = extract_frontmatter(contents) else { | ||
| return Vec::new(); | ||
| }; | ||
|
|
||
| let parsed: SkillFrontmatter = match serde_yaml::from_str(&frontmatter) { | ||
| Ok(parsed) => parsed, | ||
| Err(_) => return Vec::new(), | ||
| }; | ||
|
|
||
| parsed | ||
| .dependencies | ||
| .into_iter() | ||
| .filter_map(|entry| { | ||
| if entry.dep_type != "env_var" { | ||
| return None; | ||
| } | ||
| let name = entry.name.map(|value| sanitize_single_line(&value))?; | ||
| if name.is_empty() { | ||
| return None; | ||
| } | ||
| let description = entry | ||
| .description | ||
| .map(|value| sanitize_single_line(&value)) | ||
| .filter(|value| !value.is_empty()); | ||
| Some(SkillDependency { name, description }) | ||
| }) | ||
| .collect() | ||
| } | ||
|
|
||
| fn extract_frontmatter(contents: &str) -> Option<String> { | ||
| let mut lines = contents.lines(); | ||
| if !matches!(lines.next(), Some(line) if line.trim() == "---") { | ||
| return None; | ||
| } | ||
|
|
||
| let mut frontmatter_lines: Vec<&str> = Vec::new(); | ||
| let mut found_closing = false; | ||
| for line in lines.by_ref() { | ||
| if line.trim() == "---" { | ||
| found_closing = true; | ||
| break; | ||
| } | ||
| frontmatter_lines.push(line); | ||
| } | ||
|
|
||
| if frontmatter_lines.is_empty() || !found_closing { | ||
| return None; | ||
| } | ||
|
|
||
| Some(frontmatter_lines.join("\n")) | ||
| } | ||
|
|
||
| fn sanitize_single_line(raw: &str) -> String { | ||
| raw.split_whitespace().collect::<Vec<_>>().join(" ") | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This match arm drops
SkillDependencyRequestevents entirely. When a client setsvalidate_dependencies: true(now part of the v2UserInput::Skillpayload), core awaits a response viarequest_skill_dependencies; if the app-server never forwards or auto-resolves the request, the turn will hang indefinitely waiting on the oneshot. Please mirror the exec/patch approval handling (e.g., send a request to the client or auto-cancel withResolveSkillDependencies) so sessions don’t stall when dependencies are validated.Useful? React with 👍 / 👎.