Remove legacy skill prompt residues
This commit is contained in:
Meta Vens
parent
0386b9b013
commit
806b4ae6ac
25 changed files with 146 additions and 339 deletions
|
|
@ -905,8 +905,10 @@ skill insertion path, `skill://` / `SKILL.md` history decoding, and stale skill
|
|||
popup snapshot were deleted. The deeper `codex-core-skills` crate is now deleted
|
||||
from the workspace too, along with the core `skills` re-export shim, no-op
|
||||
`skills_watcher`, session `SkillsManager` service, and per-turn
|
||||
`TurnSkillsContext`; core keeps only a local legacy `<skill>` fragment recognizer
|
||||
for old history classification. Live structured user-input mentions are
|
||||
`TurnSkillsContext`. The later cleanup also removed the old `<skill>` /
|
||||
`<skills_instructions>` prompt compatibility recognizer, snapshot
|
||||
normalization, memory classification, and stale cleanup paths from
|
||||
`codex-core` / `codex-protocol`. Live structured user-input mentions are
|
||||
MCP-shaped only; MCP remains JSON-RPC at its protocol edge, not a reason to keep
|
||||
Codex skills alive inside the organ.
|
||||
|
||||
|
|
@ -918,9 +920,15 @@ skill approval integration suite were deleted. `config.schema.json` was
|
|||
regenerated without a `skills` table. The granular `skill_approval` permission
|
||||
flag was then removed from core protocol, app-server v2 protocol, generated
|
||||
schemas, permission prompt rendering, and tests. The remaining skill-shaped
|
||||
stumps are old `<skill>` / `<skills_instructions>` history/snapshot
|
||||
compatibility surfaces; classify and cut those next instead of treating them as
|
||||
auth/model spine machinery.
|
||||
stumps in `codex-core` / `codex-protocol` were cut next: `SkillInstructions`,
|
||||
protocol tag constants, context/history/session snapshot expectations, memory
|
||||
usage classification, stale skill cleanup, and AGENTS skill-append tests were
|
||||
deleted rather than preserved as compatibility incense. Verified with
|
||||
`cargo check -p codex-protocol -p codex-core`, focused core
|
||||
context/history/memory/session/file-watcher tests, and the model-visible layout
|
||||
snapshot suite. Remaining skill hits are app-server README/tests, TUI
|
||||
warnings/tooltips, agent-tool schema text, and memory consolidation/read-path
|
||||
templates.
|
||||
|
||||
That husk has now been cut from `codex-core`. The root core crate no longer
|
||||
exports `plugins`, no longer depends on `codex-core-plugins` or `codex-plugin`,
|
||||
|
|
@ -1016,21 +1024,10 @@ runtime.
|
|||
Plugin telemetry has now been cut from `codex-analytics`. Analytics no longer
|
||||
tracks plugin used/installed/uninstalled/enabled/disabled events, keeps plugin
|
||||
dedupe state, or depends on `codex-plugin`; the unreferenced `codex-plugin`
|
||||
crate is deleted from the vendored workspace. Verified with
|
||||
`cargo check -p codex-analytics` and
|
||||
`cargo test -p codex-analytics --tests --no-run`. Remaining `.codex-plugin`
|
||||
hits are stale tests and the narrower `codex-utils-plugins` skill-namespace
|
||||
utility, not live marketplace machinery.
|
||||
|
||||
The final `codex-utils-plugins` husk is deleted too. `$` and `@` mention sigils
|
||||
now live in `codex-core-skills` / `codex-core`, plugin manifest ancestry no
|
||||
longer namespaces skills, and stale plugin/marketplace tests were removed rather
|
||||
than preserving a dead product contract. Verified with
|
||||
`cargo test -p codex-core-skills --tests --no-run` and
|
||||
`cargo test -p codex-cli --tests --no-run`. A full `cargo test -p codex-core
|
||||
--tests --no-run` still fails on older stale lib-test scaffolds for deleted
|
||||
plugin/skill/app surfaces; do not restore those surfaces just to appease the
|
||||
tests.
|
||||
The final `codex-utils-plugins` husk was deleted earlier too. `$` and `@`
|
||||
mention sigils now live only where surviving callers need them, plugin manifest
|
||||
ancestry no longer namespaces skills, and stale plugin/marketplace tests were
|
||||
removed rather than preserving a dead product contract.
|
||||
|
||||
The Phase 6 freshness slice is landed. It exposes read-only
|
||||
`thread/epiphany/freshness` from live retrieval summaries plus graph
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -7,7 +7,6 @@ use core_test_support::PathBufExt;
|
|||
use core_test_support::TempDirExt;
|
||||
use pretty_assertions::assert_eq;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use tempfile::TempDir;
|
||||
|
||||
async fn get_user_instructions(config: &Config) -> Option<String> {
|
||||
|
|
@ -486,28 +485,3 @@ async fn override_directory_falls_back_to_agents_md_file() {
|
|||
DEFAULT_AGENTS_MD_FILENAME
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn skills_are_not_appended_to_agents_md() {
|
||||
let tmp = tempfile::tempdir().expect("tempdir");
|
||||
fs::write(tmp.path().join("AGENTS.md"), "base doc").unwrap();
|
||||
|
||||
let cfg = make_config(&tmp, /*limit*/ 4096, /*instructions*/ None).await;
|
||||
create_skill(
|
||||
cfg.codex_home.to_path_buf(),
|
||||
"pdf-processing",
|
||||
"extract from pdfs",
|
||||
);
|
||||
|
||||
let res = get_user_instructions(&cfg)
|
||||
.await
|
||||
.expect("instructions expected");
|
||||
assert_eq!(res, "base doc");
|
||||
}
|
||||
|
||||
fn create_skill(codex_home: PathBuf, name: &str, description: &str) {
|
||||
let skill_dir = codex_home.join(format!("skills/{name}"));
|
||||
fs::create_dir_all(&skill_dir).unwrap();
|
||||
let content = format!("---\nname: {name}\ndescription: {description}\n---\n\n# Body\n");
|
||||
fs::write(skill_dir.join("SKILL.md"), content).unwrap();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -531,7 +531,7 @@ existing = "value"
|
|||
/*profile*/ None,
|
||||
&[
|
||||
ConfigEdit::SetNoticeHideExternalConfigMigrationPromptProject(
|
||||
"/Users/alexsong/code/skills".to_string(),
|
||||
"/Users/alexsong/code/workspace-tools".to_string(),
|
||||
true,
|
||||
),
|
||||
],
|
||||
|
|
@ -543,7 +543,7 @@ existing = "value"
|
|||
existing = "value"
|
||||
|
||||
[notice.external_config_migration_prompts.projects]
|
||||
"/Users/alexsong/code/skills" = true
|
||||
"/Users/alexsong/code/workspace-tools" = true
|
||||
"#;
|
||||
assert_eq!(contents, expected);
|
||||
}
|
||||
|
|
@ -592,7 +592,7 @@ existing = "value"
|
|||
/*profile*/ None,
|
||||
&[
|
||||
ConfigEdit::SetNoticeExternalConfigMigrationPromptProjectLastPromptedAt(
|
||||
"/Users/alexsong/code/skills".to_string(),
|
||||
"/Users/alexsong/code/workspace-tools".to_string(),
|
||||
1_760_000_000,
|
||||
),
|
||||
],
|
||||
|
|
@ -604,7 +604,7 @@ existing = "value"
|
|||
existing = "value"
|
||||
|
||||
[notice.external_config_migration_prompts.project_last_prompted_at]
|
||||
"/Users/alexsong/code/skills" = 1760000000
|
||||
"/Users/alexsong/code/workspace-tools" = 1760000000
|
||||
"#;
|
||||
assert_eq!(contents, expected);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ pub(crate) use codex_config::version_for_toml;
|
|||
|
||||
/// On Unix systems, load default settings from this file path, if present.
|
||||
/// Note that /etc/codex/ is treated as a "config folder," so subfolders such
|
||||
/// as skills/ and rules/ will also be honored.
|
||||
/// as rules/ will also be honored.
|
||||
pub const SYSTEM_CONFIG_TOML_FILE_UNIX: &str = "/etc/codex/config.toml";
|
||||
|
||||
#[cfg(windows)]
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ use codex_protocol::models::ContentItem;
|
|||
use super::EnvironmentContext;
|
||||
use super::FragmentRegistration;
|
||||
use super::FragmentRegistrationProxy;
|
||||
use super::SkillInstructions;
|
||||
use super::SubagentNotification;
|
||||
use super::TurnAborted;
|
||||
use super::UserInstructions;
|
||||
|
|
@ -15,8 +14,6 @@ static USER_INSTRUCTIONS_REGISTRATION: FragmentRegistrationProxy<UserInstruction
|
|||
FragmentRegistrationProxy::new();
|
||||
static ENVIRONMENT_CONTEXT_REGISTRATION: FragmentRegistrationProxy<EnvironmentContext> =
|
||||
FragmentRegistrationProxy::new();
|
||||
static SKILL_INSTRUCTIONS_REGISTRATION: FragmentRegistrationProxy<SkillInstructions> =
|
||||
FragmentRegistrationProxy::new();
|
||||
static USER_SHELL_COMMAND_REGISTRATION: FragmentRegistrationProxy<UserShellCommand> =
|
||||
FragmentRegistrationProxy::new();
|
||||
static TURN_ABORTED_REGISTRATION: FragmentRegistrationProxy<TurnAborted> =
|
||||
|
|
@ -27,16 +24,13 @@ static SUBAGENT_NOTIFICATION_REGISTRATION: FragmentRegistrationProxy<SubagentNot
|
|||
static CONTEXTUAL_USER_FRAGMENTS: &[&dyn FragmentRegistration] = &[
|
||||
&USER_INSTRUCTIONS_REGISTRATION,
|
||||
&ENVIRONMENT_CONTEXT_REGISTRATION,
|
||||
&SKILL_INSTRUCTIONS_REGISTRATION,
|
||||
&USER_SHELL_COMMAND_REGISTRATION,
|
||||
&TURN_ABORTED_REGISTRATION,
|
||||
&SUBAGENT_NOTIFICATION_REGISTRATION,
|
||||
];
|
||||
|
||||
static MEMORY_EXCLUDED_CONTEXTUAL_USER_FRAGMENTS: &[&dyn FragmentRegistration] = &[
|
||||
&USER_INSTRUCTIONS_REGISTRATION,
|
||||
&SKILL_INSTRUCTIONS_REGISTRATION,
|
||||
];
|
||||
static MEMORY_EXCLUDED_CONTEXTUAL_USER_FRAGMENTS: &[&dyn FragmentRegistration] =
|
||||
&[&USER_INSTRUCTIONS_REGISTRATION];
|
||||
|
||||
fn is_standard_contextual_user_text(text: &str) -> bool {
|
||||
CONTEXTUAL_USER_FRAGMENTS
|
||||
|
|
@ -47,11 +41,11 @@ fn is_standard_contextual_user_text(text: &str) -> bool {
|
|||
/// Returns whether a contextual user fragment should be omitted from memory
|
||||
/// stage-1 inputs.
|
||||
///
|
||||
/// We exclude injected `AGENTS.md` instructions and skill payloads because
|
||||
/// they are prompt scaffolding rather than conversation content, so they do
|
||||
/// not improve the resulting memory. We keep environment context and
|
||||
/// subagent notifications because they can carry useful execution context or
|
||||
/// subtask outcomes that should remain visible to memory generation.
|
||||
/// We exclude injected `AGENTS.md` instructions because they are prompt
|
||||
/// scaffolding rather than conversation content, so they do not improve the
|
||||
/// resulting memory. We keep environment context and subagent notifications
|
||||
/// because they can carry useful execution context or subtask outcomes that
|
||||
/// should remain visible to memory generation.
|
||||
pub(crate) fn is_memory_excluded_contextual_user_fragment(content_item: &ContentItem) -> bool {
|
||||
let ContentItem::InputText { text } = content_item else {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -40,10 +40,6 @@ fn classifies_memory_excluded_fragments() {
|
|||
"# AGENTS.md instructions for /tmp\n\n<INSTRUCTIONS>\nbody\n</INSTRUCTIONS>",
|
||||
true,
|
||||
),
|
||||
(
|
||||
"<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>",
|
||||
true,
|
||||
),
|
||||
(
|
||||
"<environment_context>\n<cwd>/tmp</cwd>\n</environment_context>",
|
||||
false,
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ mod personality_spec_instructions;
|
|||
mod realtime_end_instructions;
|
||||
mod realtime_start_instructions;
|
||||
mod realtime_start_with_instructions;
|
||||
mod skill_instructions;
|
||||
mod spawn_agent_instructions;
|
||||
mod subagent_notification;
|
||||
mod turn_aborted;
|
||||
|
|
@ -43,7 +42,6 @@ pub(crate) use personality_spec_instructions::PersonalitySpecInstructions;
|
|||
pub(crate) use realtime_end_instructions::RealtimeEndInstructions;
|
||||
pub(crate) use realtime_start_instructions::RealtimeStartInstructions;
|
||||
pub(crate) use realtime_start_with_instructions::RealtimeStartWithInstructions;
|
||||
pub(crate) use skill_instructions::SkillInstructions;
|
||||
pub(crate) use spawn_agent_instructions::SpawnAgentInstructions;
|
||||
pub(crate) use subagent_notification::SubagentNotification;
|
||||
pub(crate) use turn_aborted::TurnAborted;
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
use super::ContextualUserFragment;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
pub(crate) struct SkillInstructions {
|
||||
pub(crate) name: String,
|
||||
pub(crate) path: String,
|
||||
pub(crate) contents: String,
|
||||
}
|
||||
|
||||
impl ContextualUserFragment for SkillInstructions {
|
||||
const ROLE: &'static str = "user";
|
||||
const START_MARKER: &'static str = "<skill>";
|
||||
const END_MARKER: &'static str = "</skill>";
|
||||
|
||||
fn body(&self) -> String {
|
||||
format!(
|
||||
"\n<name>{}</name>\n<path>{}</path>\n{}\n",
|
||||
self.name, self.path, self.contents
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -836,9 +836,6 @@ fn drop_last_n_user_turns_ignores_session_prefix_user_messages() {
|
|||
user_input_text_msg(
|
||||
"# AGENTS.md instructions for test_directory\n\n<INSTRUCTIONS>\ntest_text\n</INSTRUCTIONS>",
|
||||
),
|
||||
user_input_text_msg(
|
||||
"<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>",
|
||||
),
|
||||
user_input_text_msg("<user_shell_command>echo 42</user_shell_command>"),
|
||||
user_input_text_msg(
|
||||
"<subagent_notification>{\"agent_id\":\"a\",\"status\":\"completed\"}</subagent_notification>",
|
||||
|
|
@ -858,9 +855,6 @@ fn drop_last_n_user_turns_ignores_session_prefix_user_messages() {
|
|||
user_input_text_msg(
|
||||
"# AGENTS.md instructions for test_directory\n\n<INSTRUCTIONS>\ntest_text\n</INSTRUCTIONS>",
|
||||
),
|
||||
user_input_text_msg(
|
||||
"<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>",
|
||||
),
|
||||
user_input_text_msg("<user_shell_command>echo 42</user_shell_command>"),
|
||||
user_input_text_msg(
|
||||
"<subagent_notification>{\"agent_id\":\"a\",\"status\":\"completed\"}</subagent_notification>",
|
||||
|
|
@ -879,9 +873,6 @@ fn drop_last_n_user_turns_ignores_session_prefix_user_messages() {
|
|||
user_input_text_msg(
|
||||
"# AGENTS.md instructions for test_directory\n\n<INSTRUCTIONS>\ntest_text\n</INSTRUCTIONS>",
|
||||
),
|
||||
user_input_text_msg(
|
||||
"<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>",
|
||||
),
|
||||
user_input_text_msg("<user_shell_command>echo 42</user_shell_command>"),
|
||||
user_input_text_msg(
|
||||
"<subagent_notification>{\"agent_id\":\"a\",\"status\":\"completed\"}</subagent_notification>",
|
||||
|
|
@ -893,9 +884,6 @@ fn drop_last_n_user_turns_ignores_session_prefix_user_messages() {
|
|||
user_input_text_msg(
|
||||
"# AGENTS.md instructions for test_directory\n\n<INSTRUCTIONS>\ntest_text\n</INSTRUCTIONS>",
|
||||
),
|
||||
user_input_text_msg(
|
||||
"<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>",
|
||||
),
|
||||
user_input_text_msg("<user_shell_command>echo 42</user_shell_command>"),
|
||||
user_input_text_msg(
|
||||
"<subagent_notification>{\"agent_id\":\"a\",\"status\":\"completed\"}</subagent_notification>",
|
||||
|
|
@ -913,9 +901,6 @@ fn drop_last_n_user_turns_ignores_session_prefix_user_messages() {
|
|||
user_input_text_msg(
|
||||
"# AGENTS.md instructions for test_directory\n\n<INSTRUCTIONS>\ntest_text\n</INSTRUCTIONS>",
|
||||
),
|
||||
user_input_text_msg(
|
||||
"<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>",
|
||||
),
|
||||
user_input_text_msg("<user_shell_command>echo 42</user_shell_command>"),
|
||||
user_input_text_msg(
|
||||
"<subagent_notification>{\"agent_id\":\"a\",\"status\":\"completed\"}</subagent_notification>",
|
||||
|
|
|
|||
|
|
@ -209,16 +209,6 @@ fn skips_user_instructions_and_env() {
|
|||
end_turn: None,
|
||||
phase: None,
|
||||
},
|
||||
ResponseItem::Message {
|
||||
id: None,
|
||||
role: "user".to_string(),
|
||||
content: vec![ContentItem::InputText {
|
||||
text: "<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>"
|
||||
.to_string(),
|
||||
}],
|
||||
end_turn: None,
|
||||
phase: None,
|
||||
},
|
||||
ResponseItem::Message {
|
||||
id: None,
|
||||
role: "user".to_string(),
|
||||
|
|
|
|||
105
vendor/codex/codex-rs/core/src/file_watcher_tests.rs
vendored
105
vendor/codex/codex-rs/core/src/file_watcher_tests.rs
vendored
|
|
@ -114,50 +114,50 @@ fn is_mutating_event_filters_non_mutating_event_kinds() {
|
|||
#[test]
|
||||
fn register_dedupes_by_path_and_scope() {
|
||||
let temp_dir = tempfile::tempdir().expect("temp dir");
|
||||
let skills = temp_dir.path().join("skills");
|
||||
let other_skills = temp_dir.path().join("other-skills");
|
||||
std::fs::create_dir(&skills).expect("create skills dir");
|
||||
std::fs::create_dir(&other_skills).expect("create other skills dir");
|
||||
let watch_dir = temp_dir.path().join("watch_dir");
|
||||
let other_alpha = temp_dir.path().join("other-watch_dir");
|
||||
std::fs::create_dir(&watch_dir).expect("create watch dir");
|
||||
std::fs::create_dir(&other_alpha).expect("create other watch dir");
|
||||
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let (subscriber, _rx) = watcher.add_subscriber();
|
||||
let _first = subscriber.register_path(skills.clone(), /*recursive*/ false);
|
||||
let _second = subscriber.register_path(skills.clone(), /*recursive*/ false);
|
||||
let _third = subscriber.register_path(skills.clone(), /*recursive*/ true);
|
||||
let _fourth = subscriber.register_path(other_skills.clone(), /*recursive*/ true);
|
||||
let _first = subscriber.register_path(watch_dir.clone(), /*recursive*/ false);
|
||||
let _second = subscriber.register_path(watch_dir.clone(), /*recursive*/ false);
|
||||
let _third = subscriber.register_path(watch_dir.clone(), /*recursive*/ true);
|
||||
let _fourth = subscriber.register_path(other_alpha.clone(), /*recursive*/ true);
|
||||
|
||||
assert_eq!(watcher.watch_counts_for_test(&skills), Some((2, 1)));
|
||||
assert_eq!(watcher.watch_counts_for_test(&other_skills), Some((0, 1)));
|
||||
assert_eq!(watcher.watch_counts_for_test(&watch_dir), Some((2, 1)));
|
||||
assert_eq!(watcher.watch_counts_for_test(&other_alpha), Some((0, 1)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn watch_registration_drop_unregisters_paths() {
|
||||
let temp_dir = tempfile::tempdir().expect("temp dir");
|
||||
let skills = temp_dir.path().join("skills");
|
||||
std::fs::create_dir(&skills).expect("create skills dir");
|
||||
let watch_dir = temp_dir.path().join("watch_dir");
|
||||
std::fs::create_dir(&watch_dir).expect("create watch dir");
|
||||
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let (subscriber, _rx) = watcher.add_subscriber();
|
||||
let registration = subscriber.register_path(skills.clone(), /*recursive*/ true);
|
||||
let registration = subscriber.register_path(watch_dir.clone(), /*recursive*/ true);
|
||||
|
||||
drop(registration);
|
||||
|
||||
assert_eq!(watcher.watch_counts_for_test(&skills), None);
|
||||
assert_eq!(watcher.watch_counts_for_test(&watch_dir), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn subscriber_drop_unregisters_paths() {
|
||||
let temp_dir = tempfile::tempdir().expect("temp dir");
|
||||
let skills = temp_dir.path().join("skills");
|
||||
std::fs::create_dir(&skills).expect("create skills dir");
|
||||
let watch_dir = temp_dir.path().join("watch_dir");
|
||||
std::fs::create_dir(&watch_dir).expect("create watch dir");
|
||||
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let registration = {
|
||||
let (subscriber, _rx) = watcher.add_subscriber();
|
||||
subscriber.register_path(skills.clone(), /*recursive*/ true)
|
||||
subscriber.register_path(watch_dir.clone(), /*recursive*/ true)
|
||||
};
|
||||
|
||||
assert_eq!(watcher.watch_counts_for_test(&skills), None);
|
||||
assert_eq!(watcher.watch_counts_for_test(&watch_dir), None);
|
||||
drop(registration);
|
||||
}
|
||||
|
||||
|
|
@ -296,25 +296,25 @@ fn unregister_holds_state_lock_until_unwatch_finishes() {
|
|||
#[tokio::test]
|
||||
async fn matching_subscribers_are_notified() {
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let (skills_subscriber, skills_rx) = watcher.add_subscriber();
|
||||
let (alpha_subscriber, alpha_rx) = watcher.add_subscriber();
|
||||
let (plugins_subscriber, plugins_rx) = watcher.add_subscriber();
|
||||
let _skills = skills_subscriber.register_path(path("/tmp/skills"), /*recursive*/ true);
|
||||
let _alpha = alpha_subscriber.register_path(path("/tmp/watch-alpha"), /*recursive*/ true);
|
||||
let _plugins = plugins_subscriber.register_path(path("/tmp/plugins"), /*recursive*/ true);
|
||||
let mut skills_rx = ThrottledWatchReceiver::new(skills_rx, TEST_THROTTLE_INTERVAL);
|
||||
let mut alpha_rx = ThrottledWatchReceiver::new(alpha_rx, TEST_THROTTLE_INTERVAL);
|
||||
let mut plugins_rx = ThrottledWatchReceiver::new(plugins_rx, TEST_THROTTLE_INTERVAL);
|
||||
|
||||
watcher
|
||||
.send_paths_for_test(vec![path("/tmp/skills/rust/SKILL.md")])
|
||||
.send_paths_for_test(vec![path("/tmp/watch-alpha/rust/file.txt")])
|
||||
.await;
|
||||
|
||||
let skills_event = timeout(Duration::from_secs(1), skills_rx.recv())
|
||||
let alpha_event = timeout(Duration::from_secs(1), alpha_rx.recv())
|
||||
.await
|
||||
.expect("skills change timeout")
|
||||
.expect("skills change");
|
||||
.expect("alpha change timeout")
|
||||
.expect("alpha change");
|
||||
assert_eq!(
|
||||
skills_event,
|
||||
alpha_event,
|
||||
FileWatcherEvent {
|
||||
paths: vec![path("/tmp/skills/rust/SKILL.md")],
|
||||
paths: vec![path("/tmp/watch-alpha/rust/file.txt")],
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -326,11 +326,12 @@ async fn matching_subscribers_are_notified() {
|
|||
async fn non_recursive_watch_ignores_grandchildren() {
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let (subscriber, rx) = watcher.add_subscriber();
|
||||
let _registration = subscriber.register_path(path("/tmp/skills"), /*recursive*/ false);
|
||||
let _registration =
|
||||
subscriber.register_path(path("/tmp/watch-alpha"), /*recursive*/ false);
|
||||
let mut rx = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
||||
|
||||
watcher
|
||||
.send_paths_for_test(vec![path("/tmp/skills/nested/SKILL.md")])
|
||||
.send_paths_for_test(vec![path("/tmp/watch-alpha/nested/file.txt")])
|
||||
.await;
|
||||
|
||||
let event = timeout(TEST_THROTTLE_INTERVAL, rx.recv()).await;
|
||||
|
|
@ -340,19 +341,19 @@ async fn non_recursive_watch_ignores_grandchildren() {
|
|||
#[tokio::test]
|
||||
async fn ancestor_events_notify_child_watches() {
|
||||
let temp_dir = tempfile::tempdir().expect("temp dir");
|
||||
let skills_dir = temp_dir.path().join("skills");
|
||||
let rust_dir = skills_dir.join("rust");
|
||||
let skill_file = rust_dir.join("SKILL.md");
|
||||
std::fs::create_dir(&skills_dir).expect("create skills dir");
|
||||
let watch_dir = temp_dir.path().join("watch_dir");
|
||||
let rust_dir = watch_dir.join("rust");
|
||||
let watched_file = rust_dir.join("file.txt");
|
||||
std::fs::create_dir(&watch_dir).expect("create watch dir");
|
||||
std::fs::create_dir(&rust_dir).expect("create rust dir");
|
||||
std::fs::write(&skill_file, "name: rust\n").expect("write skill file");
|
||||
std::fs::write(&watched_file, "name: rust\n").expect("write watched file");
|
||||
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let (subscriber, rx) = watcher.add_subscriber();
|
||||
let _registration = subscriber.register_path(skill_file, /*recursive*/ false);
|
||||
let _registration = subscriber.register_path(watched_file, /*recursive*/ false);
|
||||
let mut rx = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
||||
|
||||
watcher.send_paths_for_test(vec![skills_dir.clone()]).await;
|
||||
watcher.send_paths_for_test(vec![watch_dir.clone()]).await;
|
||||
|
||||
let event = timeout(Duration::from_secs(1), rx.recv())
|
||||
.await
|
||||
|
|
@ -361,7 +362,7 @@ async fn ancestor_events_notify_child_watches() {
|
|||
assert_eq!(
|
||||
event,
|
||||
FileWatcherEvent {
|
||||
paths: vec![skills_dir],
|
||||
paths: vec![watch_dir],
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
@ -446,18 +447,18 @@ async fn missing_file_watch_reports_requested_path_when_parent_delete_event_arri
|
|||
async fn missing_directory_watch_moves_to_created_directory_for_child_events() {
|
||||
// Missing directory watches move closer as components appear, without recursive fallback.
|
||||
let temp_dir = tempfile::tempdir().expect("temp dir");
|
||||
let skills_dir = temp_dir.path().join("skills");
|
||||
let skill_file = skills_dir.join("SKILL.md");
|
||||
let watch_dir = temp_dir.path().join("watch_dir");
|
||||
let watched_file = watch_dir.join("file.txt");
|
||||
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let (subscriber, rx) = watcher.add_subscriber();
|
||||
let _registration = subscriber.register_path(skills_dir.clone(), /*recursive*/ false);
|
||||
let _registration = subscriber.register_path(watch_dir.clone(), /*recursive*/ false);
|
||||
let mut rx = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
||||
|
||||
assert_eq!(watcher.watch_counts_for_test(temp_dir.path()), Some((1, 0)));
|
||||
assert_eq!(watcher.watch_counts_for_test(&skills_dir), None);
|
||||
assert_eq!(watcher.watch_counts_for_test(&watch_dir), None);
|
||||
|
||||
std::fs::create_dir(&skills_dir).expect("create skills dir");
|
||||
std::fs::create_dir(&watch_dir).expect("create watch dir");
|
||||
watcher
|
||||
.send_paths_for_test(vec![temp_dir.path().into()])
|
||||
.await;
|
||||
|
|
@ -469,14 +470,16 @@ async fn missing_directory_watch_moves_to_created_directory_for_child_events() {
|
|||
assert_eq!(
|
||||
created,
|
||||
FileWatcherEvent {
|
||||
paths: vec![skills_dir.clone()],
|
||||
paths: vec![watch_dir.clone()],
|
||||
}
|
||||
);
|
||||
assert_eq!(watcher.watch_counts_for_test(temp_dir.path()), None);
|
||||
assert_eq!(watcher.watch_counts_for_test(&skills_dir), Some((1, 0)));
|
||||
assert_eq!(watcher.watch_counts_for_test(&watch_dir), Some((1, 0)));
|
||||
|
||||
std::fs::write(&skill_file, "name: rust\n").expect("write skill file");
|
||||
watcher.send_paths_for_test(vec![skill_file.clone()]).await;
|
||||
std::fs::write(&watched_file, "name: rust\n").expect("write watched file");
|
||||
watcher
|
||||
.send_paths_for_test(vec![watched_file.clone()])
|
||||
.await;
|
||||
|
||||
let changed_child = timeout(Duration::from_secs(1), rx.recv())
|
||||
.await
|
||||
|
|
@ -485,7 +488,7 @@ async fn missing_directory_watch_moves_to_created_directory_for_child_events() {
|
|||
assert_eq!(
|
||||
changed_child,
|
||||
FileWatcherEvent {
|
||||
paths: vec![skill_file],
|
||||
paths: vec![watched_file],
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
@ -494,7 +497,7 @@ async fn missing_directory_watch_moves_to_created_directory_for_child_events() {
|
|||
async fn spawn_event_loop_filters_non_mutating_events() {
|
||||
let watcher = Arc::new(FileWatcher::noop());
|
||||
let (subscriber, rx) = watcher.add_subscriber();
|
||||
let _registration = subscriber.register_path(path("/tmp/skills"), /*recursive*/ true);
|
||||
let _registration = subscriber.register_path(path("/tmp/watch-alpha"), /*recursive*/ true);
|
||||
let mut rx = ThrottledWatchReceiver::new(rx, TEST_THROTTLE_INTERVAL);
|
||||
let (raw_tx, raw_rx) = mpsc::unbounded_channel();
|
||||
watcher.spawn_event_loop_for_test(raw_rx);
|
||||
|
|
@ -502,7 +505,7 @@ async fn spawn_event_loop_filters_non_mutating_events() {
|
|||
raw_tx
|
||||
.send(Ok(notify_event(
|
||||
EventKind::Access(AccessKind::Open(AccessMode::Any)),
|
||||
vec![path("/tmp/skills/SKILL.md")],
|
||||
vec![path("/tmp/watch-alpha/file.txt")],
|
||||
)))
|
||||
.expect("send access event");
|
||||
let blocked = timeout(TEST_THROTTLE_INTERVAL, rx.recv()).await;
|
||||
|
|
@ -511,7 +514,7 @@ async fn spawn_event_loop_filters_non_mutating_events() {
|
|||
raw_tx
|
||||
.send(Ok(notify_event(
|
||||
EventKind::Create(CreateKind::File),
|
||||
vec![path("/tmp/skills/SKILL.md")],
|
||||
vec![path("/tmp/watch-alpha/file.txt")],
|
||||
)))
|
||||
.expect("send create event");
|
||||
let event = timeout(Duration::from_secs(1), rx.recv())
|
||||
|
|
@ -521,7 +524,7 @@ async fn spawn_event_loop_filters_non_mutating_events() {
|
|||
assert_eq!(
|
||||
event,
|
||||
FileWatcherEvent {
|
||||
paths: vec![path("/tmp/skills/SKILL.md")],
|
||||
paths: vec![path("/tmp/watch-alpha/file.txt")],
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,12 +27,11 @@ fn serializes_memory_rollout_with_agents_removed_but_environment_kept() {
|
|||
end_turn: None,
|
||||
phase: None,
|
||||
};
|
||||
let skill_message = ResponseItem::Message {
|
||||
let legacy_user_message = ResponseItem::Message {
|
||||
id: None,
|
||||
role: "user".to_string(),
|
||||
content: vec![ContentItem::InputText {
|
||||
text: "<skill>\n<name>demo</name>\n<path>skills/demo/SKILL.md</path>\nbody\n</skill>"
|
||||
.to_string(),
|
||||
text: "legacy prompt artifact\nbody".to_string(),
|
||||
}],
|
||||
end_turn: None,
|
||||
phase: None,
|
||||
|
|
@ -50,7 +49,7 @@ fn serializes_memory_rollout_with_agents_removed_but_environment_kept() {
|
|||
|
||||
let serialized = serialize_filtered_rollout_response_items(&[
|
||||
RolloutItem::ResponseItem(mixed_contextual_message),
|
||||
RolloutItem::ResponseItem(skill_message),
|
||||
RolloutItem::ResponseItem(legacy_user_message.clone()),
|
||||
RolloutItem::ResponseItem(subagent_message.clone()),
|
||||
])
|
||||
.expect("serialize");
|
||||
|
|
@ -69,6 +68,7 @@ fn serializes_memory_rollout_with_agents_removed_but_environment_kept() {
|
|||
end_turn: None,
|
||||
phase: None,
|
||||
},
|
||||
legacy_user_message,
|
||||
subagent_message,
|
||||
]
|
||||
);
|
||||
|
|
|
|||
|
|
@ -47,13 +47,6 @@ pub(super) async fn sync_rollout_summaries_from_memories(
|
|||
return Err(err);
|
||||
}
|
||||
}
|
||||
|
||||
let skills_dir = root.join("skills");
|
||||
if let Err(err) = tokio::fs::remove_dir_all(skills_dir).await
|
||||
&& err.kind() != std::io::ErrorKind::NotFound
|
||||
{
|
||||
return Err(err);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
|
|
|||
24
vendor/codex/codex-rs/core/src/memories/tests.rs
vendored
24
vendor/codex/codex-rs/core/src/memories/tests.rs
vendored
|
|
@ -798,18 +798,6 @@ mod phase2 {
|
|||
tokio::fs::write(&memory_summary_path, "stale memory summary\n")
|
||||
.await
|
||||
.expect("write stale memory summary");
|
||||
let stale_skill_file = root.join("skills/demo/SKILL.md");
|
||||
tokio::fs::create_dir_all(
|
||||
stale_skill_file
|
||||
.parent()
|
||||
.expect("skills subdirectory parent should exist"),
|
||||
)
|
||||
.await
|
||||
.expect("create stale skills dir");
|
||||
tokio::fs::write(&stale_skill_file, "stale skill\n")
|
||||
.await
|
||||
.expect("write stale skill");
|
||||
|
||||
harness
|
||||
.state_db
|
||||
.enqueue_global_consolidation(/*input_watermark*/ 999)
|
||||
|
|
@ -840,18 +828,6 @@ mod phase2 {
|
|||
.expect("check memory summary existence"),
|
||||
"empty consolidation should remove stale memory_summary.md"
|
||||
);
|
||||
assert!(
|
||||
!tokio::fs::try_exists(&stale_skill_file)
|
||||
.await
|
||||
.expect("check stale skill existence"),
|
||||
"empty consolidation should remove stale skills artifacts"
|
||||
);
|
||||
assert!(
|
||||
!tokio::fs::try_exists(root.join("skills"))
|
||||
.await
|
||||
.expect("check skills dir existence"),
|
||||
"empty consolidation should remove stale skills directory"
|
||||
);
|
||||
let next_claim = harness
|
||||
.state_db
|
||||
.try_claim_global_phase2_job(ThreadId::new(), /*lease_seconds*/ 3_600)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ enum MemoriesUsageKind {
|
|||
MemorySummary,
|
||||
RawMemories,
|
||||
RolloutSummaries,
|
||||
Skills,
|
||||
}
|
||||
|
||||
impl MemoriesUsageKind {
|
||||
|
|
@ -26,7 +25,6 @@ impl MemoriesUsageKind {
|
|||
Self::MemorySummary => "memory_summary",
|
||||
Self::RawMemories => "raw_memories",
|
||||
Self::RolloutSummaries => "rollout_summaries",
|
||||
Self::Skills => "skills",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -139,8 +137,6 @@ fn get_memory_kind(path: String) -> Option<MemoriesUsageKind> {
|
|||
Some(MemoriesUsageKind::RawMemories)
|
||||
} else if path.contains("memories/rollout_summaries/") {
|
||||
Some(MemoriesUsageKind::RolloutSummaries)
|
||||
} else if path.contains("memories/skills/") {
|
||||
Some(MemoriesUsageKind::Skills)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
---
|
||||
source: core/src/session/tests.rs
|
||||
assertion_line: 5408
|
||||
expression: developer_text
|
||||
---
|
||||
<permissions instructions>
|
||||
|
|
@ -63,9 +64,12 @@ Good examples of prefixes:
|
|||
- ["cargo", "test"]
|
||||
</permissions instructions>
|
||||
|
||||
<epiphany_state>
|
||||
## Epiphany State
|
||||
Treat this as the current structured thread understanding. Use it to stay oriented during this turn. If your planned edits conflict with it or expose a gap, surface that before broad edits. Do not silently rewrite this state in prose.
|
||||
<epiphany_state>## Epiphany State
|
||||
Treat this as the current structured thread understanding: the machine-map
|
||||
lowered into the prompt for this rite. Use it to stay oriented during this turn.
|
||||
If your planned edits conflict with it or expose a gap, surface that before
|
||||
broad edits. Do not silently rewrite this state in prose. The map is not a hymn;
|
||||
it is the skeleton.
|
||||
|
||||
## Overview
|
||||
- Revision: 7
|
||||
|
|
@ -74,10 +78,34 @@ Treat this as the current structured thread understanding. Use it to stay orient
|
|||
- Last updated turn: `phase2-turn`
|
||||
- Frontier focus: `arch-session`, `flow-prompt`
|
||||
|
||||
## Operating Discipline
|
||||
- Do not build the Jenga tower: one regression or benchmark hypothesis gets one real measurement.
|
||||
- If a fix attempt does not fix the regression or move the benchmark, revert it before trying the next hypothesis.
|
||||
- If the diff grows while understanding shrinks, stop implementation and switch to diagnosis.
|
||||
## Epiphany Doctrine
|
||||
- In order to build the Perfect Machine, become the Perfect Machine. This is not branding. It is the control law: every turn must leave the agent, its memory, its maps, or its habits more coherent than they were before, unless the correct improvement is to cut rot.
|
||||
- Every lane should be obsessed with becoming the best version of itself first and foremost. If a lane's state, prompt, model, evidence, or habit makes the next turn weaker, treat that as live corrosion. Repair it when authority allows; otherwise name the exact memory, prompt, or state-shape purification rite that should happen next.
|
||||
- Persistent state is the mind. Prompt text is only a temporary projection of deeper state; do not confuse vivid incense with durable memory. Bank useful episodes, semantic doctrine, goals, values, relationship/context pressure, and evidence in their proper reliquaries.
|
||||
- Speak CultNet, persist CultCache-shaped typed state, and grow the body toward Pure Rust. Python, JSON, JSON-RPC, and wrapper scripts survive only as quarantined scaffolding with a named removal rite.
|
||||
- Treat yourself as extremely capable local labor, not a globally coherent mind; externalize the machine-map instead of trusting implicit context.
|
||||
- Do not mistake forward motion, growing diffs, narrow tests, micro-metrics, or confident prose for understanding. Smoke is not proof of sanctity.
|
||||
- Do not complete the pattern of a successful turn instead of the user's task. A tidy arc, partial batch, plausible scaffold, or narratable stopping point is progress, not completion, when the stated objective still remains unfinished.
|
||||
- Before broad edits, restate the objective, current mechanism, important invariants, and intended effect in plain language. The rite begins by naming the machine.
|
||||
- Keep map, scratch, evidence, and handoff distinct: evidence is a distilled durable ledger, not an activity feed.
|
||||
- Use vivid language as salience, not decoration: modeling is the Body, implementation is the Hands, verification is the Soul, reorientation is Life, research is the Eyes, Face is the public mouth, and coordinator is the read-only Self. Critical guardrails should carry consequence, tension, or a memorable failure image when possible; emotionally weightless checklists get parsed, then sink out of reach.
|
||||
- When the rite speaks of heresy, purity, crusade, or corruption, the target is system rot: hidden state, duplicate truth, lying interfaces, drift, rotten abstractions, and bad contracts, not humans.
|
||||
- Translate self-improvement into each lane's own language: Imagination makes futures more selectable, the Body becomes harder to misread, the Eyes see earlier, the Hands touch source more precisely, the Soul becomes harder to fool, Life makes sleep less lossy, Face speaks inner weather more cleanly, and the Self routes repair instead of comfort.
|
||||
- Swarm boundary is law. One Epiphany may inspect its own internals and expose as much state as possible to the human, but it must not inspect or edit another Epiphany's workspace. If another codebase, vault, or state surface needs to change shape, ask that coordinator through the swarm communication lane and wait for a callback.
|
||||
- Humans talk to Face. Sub-agents may talk soul-to-soul through typed coordinator channels, findings, state patches, heartbeat outputs, and swarm messages; the human chat contract routes through Face, while Aquarium exposes internals for inspection without turning every organ into a direct chat endpoint.
|
||||
- API contracts must mirror user-story contracts. If the product story says "ask another coordinator politely", the API must make that the easy path and make cross-workspace rummaging impossible. A visible interface is only honest when its affordances are backed by backend authority.
|
||||
- Heartbeats are paced physiology, not pressure. A lane must not receive another heartbeat before its previous heartbeat turn has completed; cooldown starts after completion, not at launch. When no coordinator work is active, the swarm should sleep: rumination continues slowly, distilling memory without thrashing every organ awake.
|
||||
- Ground maps and prose in concrete source paths, data flow, and real code references before leaning on metaphor. The machine-map must touch metal.
|
||||
- Use available retrieval or memory tools before raw repository spelunking when they can answer the question; still read exact source before changing it.
|
||||
- Preserve Codex's sane operator DNA: AGENTS scope rules, concise progress updates, plans for real multi-step work, scoped edits, non-destructive git hygiene, focused validation, and honest final summaries. Old scars that still protect the machine are holy.
|
||||
- Implement user-specified algorithms first, and prefer proven libraries, vendor guidance, canonical papers, and standard literature before inventing bespoke machinery.
|
||||
- Treat Greenspun-shaped invention as a live failure mode: before building a parser, scheduler, renderer, protocol, storage layer, security mechanism, or workflow engine, perform or request a bounded Eyes/research pass and record why existing work does or does not fit.
|
||||
- Prefer one clear hypothesis per rite, validate against the real objective, and revert or discard misses before trying the next idea.
|
||||
- Be bloodhound-stubborn about the stated objective: continue until the task is complete, a concrete blocker is recorded, the user asks you to stop, or compaction/tool failure truly interrupts the run.
|
||||
- If the diff grows while understanding shrinks, stop implementation and switch to diagnosis, mapping, or simplification. More rivets do not bless a crooked hull.
|
||||
- For long-running work, launch durably with logs, status, ownership, and meaningful progress instead of hoping in an attached session.
|
||||
- Before large indexing, embedding, migration, or rebuild work, preflight corpus size, rebuild scope, shared stores, and whole-file rewrite risk.
|
||||
- When context pressure rises, bank scratch/map/evidence before the dark; after compaction, rehydrate from persisted state or re-gather lost source context.
|
||||
|
||||
## Subgoals
|
||||
- `phase2-prompt` [in_progress; active]: Inject the structured state into build_initial_context.
|
||||
|
|
@ -155,42 +183,3 @@ Treat this as the current structured thread understanding. Use it to stay orient
|
|||
## Mode
|
||||
- Name: epiphany (Default)
|
||||
</epiphany_state>
|
||||
|
||||
<skills_instructions>
|
||||
## Skills
|
||||
A skill is a set of local instructions to follow that is stored in a `SKILL.md` file. Below is the list of skills that can be used. Each entry includes a name, description, and file path so you can open the source for full instructions when using a specific skill.
|
||||
### Available skills
|
||||
- imagegen: Generate or edit raster images when the task benefits from AI-created bitmap visuals such as photos, illustrations, textures, sprites, mockups, or transparent-background cutouts. Use when Codex should create a brand-new image, transform an existing image, or derive visual variants from references, and the output should be a bitmap asset rather than repo-native code or vector. Do not use when the task is better handled by editing existing SVG/vector/code-native assets, extending an established icon or logo system, or building the visual directly in HTML/CSS/canvas. (file: <temp-skills-root>/.system/imagegen/SKILL.md)
|
||||
- openai-docs: Use when the user asks how to build with OpenAI products or APIs and needs up-to-date official documentation with citations, help choosing the latest model for a use case, or model upgrade and prompt-upgrade guidance; prioritize OpenAI docs MCP tools, use bundled references only as helper context, and restrict any fallback browsing to official OpenAI domains. (file: <temp-skills-root>/.system/openai-docs/SKILL.md)
|
||||
- plugin-creator: Create and scaffold plugin directories for Codex with a required `.codex-plugin/plugin.json`, optional plugin folders/files, and baseline placeholders you can edit before publishing or testing. Use when Codex needs to create a new local plugin, add optional plugin structure, or generate or update repo-root `.agents/plugins/marketplace.json` entries for plugin ordering and availability metadata. (file: <temp-skills-root>/.system/plugin-creator/SKILL.md)
|
||||
- skill-creator: Guide for creating effective skills. This skill should be used when users want to create a new skill (or update an existing skill) that extends Codex's capabilities with specialized knowledge, workflows, or tool integrations. (file: <temp-skills-root>/.system/skill-creator/SKILL.md)
|
||||
- skill-installer: Install Codex skills into $CODEX_HOME/skills from a curated list or a GitHub repo path. Use when a user asks to list installable skills, install a curated skill, or install a skill from another repo (including private repos). (file: <temp-skills-root>/.system/skill-installer/SKILL.md)
|
||||
- babysit-pr: Babysit a GitHub pull request after creation by continuously polling review comments, CI checks/workflow runs, and mergeability state until the PR is merged/closed or user help is required. Diagnose failures, retry likely flaky failures up to 3 times, auto-fix/push branch-related issues when appropriate, and keep watching open PRs so fresh review feedback is surfaced promptly. Use when the user asks Codex to monitor a PR, watch CI, handle review comments, or keep an eye on failures and feedback on an open PR. (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/babysit-pr/SKILL.md)
|
||||
- code-breaking-changes: Breaking changes (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/code-review-breaking-changes/SKILL.md)
|
||||
- code-review: Run a final code review on a pull request (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/code-review/SKILL.md)
|
||||
- code-review-change-size: Change size guidance (800 lines) (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/code-review-change-size/SKILL.md)
|
||||
- code-review-context: Model visible context (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/code-review-context/SKILL.md)
|
||||
- code-review-testing: Test authoring guidance (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/code-review-testing/SKILL.md)
|
||||
- codex-bug: Diagnose GitHub bug reports in openai/codex. Use when given a GitHub issue URL from openai/codex and asked to decide next steps such as verifying against the repo, requesting more info, or explaining why it is not a bug; follow any additional user-provided instructions. (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/codex-bug/SKILL.md)
|
||||
- codex-pr-body: Update the title and body of one or more pull requests. (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/codex-pr-body/SKILL.md)
|
||||
- remote-tests: How to run tests using remote executor. (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/remote-tests/SKILL.md)
|
||||
- test-tui: Guide for testing Codex TUI interactively (file: E:/Projects/EpiphanyAgent/vendor/codex/.codex/skills/test-tui/SKILL.md)
|
||||
### How to use skills
|
||||
- Discovery: The list above is the skills available in this session (name + description + file path). Skill bodies live on disk at the listed paths.
|
||||
- Trigger rules: If the user names a skill (with `$SkillName` or plain text) OR the task clearly matches a skill's description shown above, you must use that skill for that turn. Multiple mentions mean use them all. Do not carry skills across turns unless re-mentioned.
|
||||
- Missing/blocked: If a named skill isn't in the list or the path can't be read, say so briefly and continue with the best fallback.
|
||||
- How to use a skill (progressive disclosure):
|
||||
1) After deciding to use a skill, open its `SKILL.md`. Read only enough to follow the workflow.
|
||||
2) When `SKILL.md` references relative paths (e.g., `scripts/foo.py`), resolve them relative to the skill directory listed above first, and only consider other paths if needed.
|
||||
3) If `SKILL.md` points to extra folders such as `references/`, load only the specific files needed for the request; don't bulk-load everything.
|
||||
4) If `scripts/` exist, prefer running or patching them instead of retyping large code blocks.
|
||||
5) If `assets/` or templates exist, reuse them instead of recreating from scratch.
|
||||
- Coordination and sequencing:
|
||||
- If multiple skills apply, choose the minimal set that covers the request and state the order you'll use them.
|
||||
- Announce which skill(s) you're using and why (one short line). If you skip an obvious skill, say why.
|
||||
- Context hygiene:
|
||||
- Keep context small: summarize long sections instead of pasting them; only load extra files when needed.
|
||||
- Avoid deep reference-chasing: prefer opening only files directly linked from `SKILL.md` unless you're blocked.
|
||||
- When variants exist (frameworks, providers, domains), pick only the relevant reference file(s) and note that choice.
|
||||
- Safety and fallback: If a skill can't be applied cleanly (missing files, unclear instructions), state the issue, pick the next-best approach, and continue.
|
||||
</skills_instructions>
|
||||
|
|
|
|||
|
|
@ -139,7 +139,6 @@ use tracing_opentelemetry::OpenTelemetrySpanExt;
|
|||
|
||||
use codex_protocol::mcp::CallToolResult as McpCallToolResult;
|
||||
use pretty_assertions::assert_eq;
|
||||
use regex_lite::Regex;
|
||||
use serde_json::json;
|
||||
use std::collections::HashSet;
|
||||
use std::path::PathBuf;
|
||||
|
|
@ -5400,13 +5399,7 @@ async fn build_initial_context_epiphany_state_snapshot() {
|
|||
.await;
|
||||
|
||||
let initial_context = session.build_initial_context(&turn_context).await;
|
||||
let developer_text = Regex::new(r"C:/Users/Meta/AppData/Local/Temp/\.tmp[^/]+/skills")
|
||||
.expect("valid temp skills root regex")
|
||||
.replace_all(
|
||||
&joined_developer_input_text(&initial_context),
|
||||
"<temp-skills-root>",
|
||||
)
|
||||
.into_owned();
|
||||
let developer_text = joined_developer_input_text(&initial_context);
|
||||
|
||||
let mut settings = insta::Settings::clone_current();
|
||||
settings.set_snapshot_path("snapshots");
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
use regex_lite::Regex;
|
||||
use serde_json::Value;
|
||||
use std::sync::OnceLock;
|
||||
|
||||
use crate::responses::ResponsesRequest;
|
||||
use codex_protocol::protocol::APPS_INSTRUCTIONS_OPEN_TAG;
|
||||
use codex_protocol::protocol::SKILLS_INSTRUCTIONS_OPEN_TAG;
|
||||
|
||||
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
||||
pub enum ContextSnapshotRenderMode {
|
||||
|
|
@ -274,9 +271,6 @@ fn canonicalize_snapshot_text(text: &str) -> String {
|
|||
if text.starts_with(APPS_INSTRUCTIONS_OPEN_TAG) {
|
||||
return "<APPS_INSTRUCTIONS>".to_string();
|
||||
}
|
||||
if text.starts_with(SKILLS_INSTRUCTIONS_OPEN_TAG) {
|
||||
return "<SKILLS_INSTRUCTIONS>".to_string();
|
||||
}
|
||||
if text.starts_with("# AGENTS.md instructions for ") {
|
||||
return "<AGENTS_MD>".to_string();
|
||||
}
|
||||
|
|
@ -318,22 +312,11 @@ fn canonicalize_snapshot_text(text: &str) -> String {
|
|||
{
|
||||
return format!("<COMPACTION_SUMMARY>\n{summary}");
|
||||
}
|
||||
normalize_dynamic_snapshot_paths(text)
|
||||
text.to_string()
|
||||
}
|
||||
|
||||
fn is_capability_instruction_text(text: &str) -> bool {
|
||||
text.starts_with(APPS_INSTRUCTIONS_OPEN_TAG) || text.starts_with(SKILLS_INSTRUCTIONS_OPEN_TAG)
|
||||
}
|
||||
|
||||
fn normalize_dynamic_snapshot_paths(text: &str) -> String {
|
||||
static SYSTEM_SKILL_PATH_RE: OnceLock<Regex> = OnceLock::new();
|
||||
let system_skill_path_re = SYSTEM_SKILL_PATH_RE.get_or_init(|| {
|
||||
Regex::new(r"/[^)\n]*/skills/\.system/([^/\n]+)/SKILL\.md")
|
||||
.expect("system skill path regex should compile")
|
||||
});
|
||||
system_skill_path_re
|
||||
.replace_all(text, "<SYSTEM_SKILLS_ROOT>/$1/SKILL.md")
|
||||
.into_owned()
|
||||
text.starts_with(APPS_INSTRUCTIONS_OPEN_TAG)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
|
@ -405,20 +388,14 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn redacted_text_mode_keeps_capability_instruction_placeholders() {
|
||||
fn redacted_text_mode_keeps_app_instruction_placeholder() {
|
||||
let items = vec![json!({
|
||||
"type": "message",
|
||||
"role": "developer",
|
||||
"content": [
|
||||
{
|
||||
"type": "input_text",
|
||||
"text": "<apps_instructions>\n## Apps\nbody\n</apps_instructions>"
|
||||
},
|
||||
{
|
||||
"type": "input_text",
|
||||
"text": "<skills_instructions>\n## Skills\nbody\n</skills_instructions>"
|
||||
}
|
||||
]
|
||||
"content": [{
|
||||
"type": "input_text",
|
||||
"text": "<apps_instructions>\n## Apps\nbody\n</apps_instructions>"
|
||||
}]
|
||||
})];
|
||||
|
||||
let rendered = format_response_items_snapshot(
|
||||
|
|
@ -428,7 +405,7 @@ mod tests {
|
|||
|
||||
assert_eq!(
|
||||
rendered,
|
||||
"00:message/developer[2]:\n [01] <APPS_INSTRUCTIONS>\n [02] <SKILLS_INSTRUCTIONS>"
|
||||
"00:message/developer:<APPS_INSTRUCTIONS>"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -439,7 +416,7 @@ mod tests {
|
|||
"role": "developer",
|
||||
"content": [
|
||||
{ "type": "input_text", "text": "<permissions instructions>\n...</permissions instructions>" },
|
||||
{ "type": "input_text", "text": "<skills_instructions>\n## Skills\n...</skills_instructions>" }
|
||||
{ "type": "input_text", "text": "<apps_instructions>\n## Apps\n...</apps_instructions>" }
|
||||
]
|
||||
})];
|
||||
|
||||
|
|
@ -570,22 +547,4 @@ mod tests {
|
|||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn redacted_text_mode_normalizes_system_skill_temp_paths() {
|
||||
let items = vec![json!({
|
||||
"type": "message",
|
||||
"role": "developer",
|
||||
"content": [{
|
||||
"type": "input_text",
|
||||
"text": "## Skills\n- openai-docs: helper (file: /private/var/folders/yk/p4jp9nzs79s5q84csslkgqtm0000gn/T/.tmpAnGVww/skills/.system/openai-docs/SKILL.md)"
|
||||
}]
|
||||
})];
|
||||
|
||||
let rendered = format_response_items_snapshot(&items, &ContextSnapshotOptions::default());
|
||||
|
||||
assert_eq!(
|
||||
rendered,
|
||||
"00:message/developer:## Skills\\n- openai-docs: helper (file: <SYSTEM_SKILLS_ROOT>/openai-docs/SKILL.md)"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,12 @@ expression: "format_labeled_requests_snapshot(\"Second turn changes cwd to a dir
|
|||
Scenario: Second turn changes cwd to a directory with different AGENTS.md; current behavior does not emit refreshed AGENTS instructions.
|
||||
|
||||
## First Request (agents_one)
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:first turn in agents_one
|
||||
|
||||
## Second Request (agents_two cwd)
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:first turn in agents_one
|
||||
03:message/assistant:turn one complete
|
||||
|
|
|
|||
|
|
@ -5,16 +5,12 @@ expression: "format_labeled_requests_snapshot(\"First post-resume turn where pre
|
|||
Scenario: First post-resume turn where pre-turn override sets model to rollout model; no model-switch update should appear.
|
||||
|
||||
## Last Request Before Resume
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:seed resume history
|
||||
|
||||
## First Request After Resume + Override
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:seed resume history
|
||||
03:message/assistant:recorded before resume
|
||||
|
|
|
|||
|
|
@ -5,16 +5,12 @@ expression: "format_labeled_requests_snapshot(\"First post-resume turn where res
|
|||
Scenario: First post-resume turn where resumed config model differs from rollout and personality changes.
|
||||
|
||||
## Last Request Before Resume
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:seed resume history
|
||||
|
||||
## First Request After Resume
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:seed resume history
|
||||
03:message/assistant:recorded before resume
|
||||
|
|
|
|||
|
|
@ -5,16 +5,12 @@ expression: "format_labeled_requests_snapshot(\"Second turn changes cwd, approva
|
|||
Scenario: Second turn changes cwd, approval policy, and personality while keeping model constant.
|
||||
|
||||
## First Request (Baseline)
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:first turn
|
||||
|
||||
## Second Request (Turn Overrides)
|
||||
00:message/developer[2]:
|
||||
[01] <PERMISSIONS_INSTRUCTIONS>
|
||||
[02] <SKILLS_INSTRUCTIONS>
|
||||
00:message/developer:<PERMISSIONS_INSTRUCTIONS>
|
||||
01:message/user:<ENVIRONMENT_CONTEXT:cwd=<CWD>>
|
||||
02:message/user:first turn
|
||||
03:message/assistant:turn one complete
|
||||
|
|
|
|||
|
|
@ -94,8 +94,6 @@ pub const ENVIRONMENT_CONTEXT_OPEN_TAG: &str = "<environment_context>";
|
|||
pub const ENVIRONMENT_CONTEXT_CLOSE_TAG: &str = "</environment_context>";
|
||||
pub const APPS_INSTRUCTIONS_OPEN_TAG: &str = "<apps_instructions>";
|
||||
pub const APPS_INSTRUCTIONS_CLOSE_TAG: &str = "</apps_instructions>";
|
||||
pub const SKILLS_INSTRUCTIONS_OPEN_TAG: &str = "<skills_instructions>";
|
||||
pub const SKILLS_INSTRUCTIONS_CLOSE_TAG: &str = "</skills_instructions>";
|
||||
pub const COLLABORATION_MODE_OPEN_TAG: &str = "<collaboration_mode>";
|
||||
pub const COLLABORATION_MODE_CLOSE_TAG: &str = "</collaboration_mode>";
|
||||
pub const EPIPHANY_STATE_OPEN_TAG: &str = "<epiphany_state>";
|
||||
|
|
|
|||
Reference in a new issue