mirror of
https://github.com/openai/codex.git
synced 2026-06-02 19:31:59 +00:00
codex: fix skills path ref compile errors
This commit is contained in:
@@ -371,6 +371,7 @@ fn repo_config_skill_roots(
|
||||
ConfigLayerStackOrdering::HighestPrecedenceFirst,
|
||||
/*include_disabled*/ true,
|
||||
)
|
||||
.into_iter()
|
||||
.filter_map(|layer| match &layer.name {
|
||||
ConfigLayerSource::Project { .. } => layer.config_folder().map(|config_folder| {
|
||||
SkillRoot {
|
||||
|
||||
@@ -25,7 +25,7 @@ use codex_config::SkillsConfig;
|
||||
use codex_exec_server::EnvironmentPathRef;
|
||||
use codex_exec_server::ExecutorFileSystem;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
#[derive(Clone)]
|
||||
pub struct SkillsLoadInput {
|
||||
pub env_path: EnvironmentPathRef,
|
||||
/// Local absolute skill roots use this filesystem when local exec is available.
|
||||
@@ -37,6 +37,18 @@ pub struct SkillsLoadInput {
|
||||
pub bundled_skills_enabled: bool,
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for SkillsLoadInput {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.debug_struct("SkillsLoadInput")
|
||||
.field("env_path", &self.env_path)
|
||||
.field("has_local_file_system", &self.local_file_system.is_some())
|
||||
.field("effective_skill_roots", &self.effective_skill_roots)
|
||||
.field("config_layer_stack", &self.config_layer_stack)
|
||||
.field("bundled_skills_enabled", &self.bundled_skills_enabled)
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
||||
impl SkillsLoadInput {
|
||||
pub fn new(
|
||||
env_path: EnvironmentPathRef,
|
||||
|
||||
@@ -7,6 +7,7 @@ use codex_config::CONFIG_TOML_FILE;
|
||||
use codex_config::ConfigLayerEntry;
|
||||
use codex_config::ConfigLayerStack;
|
||||
use codex_config::ConfigRequirementsToml;
|
||||
use codex_exec_server::LOCAL_FS;
|
||||
use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
use codex_utils_absolute_path::test_support::PathBufExt;
|
||||
use codex_utils_absolute_path::test_support::PathExt;
|
||||
@@ -16,6 +17,7 @@ use std::collections::HashSet;
|
||||
use std::fs;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
use tempfile::TempDir;
|
||||
|
||||
fn write_user_skill(codex_home: &TempDir, dir: &str, name: &str, description: &str) {
|
||||
|
||||
Reference in New Issue
Block a user