oh-my-codex 0.18.0 → 0.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Cargo.lock +6 -6
- package/Cargo.toml +1 -1
- package/README.md +43 -19
- package/crates/omx-api/src/lib.rs +66 -9
- package/crates/omx-sparkshell/src/exec.rs +125 -3
- package/crates/omx-sparkshell/src/main.rs +126 -36
- package/crates/omx-sparkshell/tests/execution.rs +225 -1
- package/dist/cli/__tests__/codex-plugin-layout.test.js +15 -7
- package/dist/cli/__tests__/codex-plugin-layout.test.js.map +1 -1
- package/dist/cli/__tests__/doctor-warning-copy.test.js +76 -3
- package/dist/cli/__tests__/doctor-warning-copy.test.js.map +1 -1
- package/dist/cli/__tests__/index.test.js +49 -1
- package/dist/cli/__tests__/index.test.js.map +1 -1
- package/dist/cli/__tests__/install-docs-contract.test.d.ts +2 -0
- package/dist/cli/__tests__/install-docs-contract.test.d.ts.map +1 -0
- package/dist/cli/__tests__/install-docs-contract.test.js +55 -0
- package/dist/cli/__tests__/install-docs-contract.test.js.map +1 -0
- package/dist/cli/__tests__/launch-fallback.test.js +115 -0
- package/dist/cli/__tests__/launch-fallback.test.js.map +1 -1
- package/dist/cli/__tests__/question.test.js +27 -41
- package/dist/cli/__tests__/question.test.js.map +1 -1
- package/dist/cli/__tests__/setup-install-mode.test.js +94 -35
- package/dist/cli/__tests__/setup-install-mode.test.js.map +1 -1
- package/dist/cli/__tests__/sparkshell-cli.test.js +20 -1
- package/dist/cli/__tests__/sparkshell-cli.test.js.map +1 -1
- package/dist/cli/__tests__/sparkshell-packaging.test.js +1 -0
- package/dist/cli/__tests__/sparkshell-packaging.test.js.map +1 -1
- package/dist/cli/__tests__/ultragoal.test.js +227 -4
- package/dist/cli/__tests__/ultragoal.test.js.map +1 -1
- package/dist/cli/__tests__/update.test.js +72 -1
- package/dist/cli/__tests__/update.test.js.map +1 -1
- package/dist/cli/codex-feature-probe.d.ts +5 -0
- package/dist/cli/codex-feature-probe.d.ts.map +1 -1
- package/dist/cli/codex-feature-probe.js +13 -7
- package/dist/cli/codex-feature-probe.js.map +1 -1
- package/dist/cli/doctor.d.ts +7 -0
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +119 -10
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/index.d.ts +3 -1
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +345 -90
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/plugin-marketplace.d.ts +2 -0
- package/dist/cli/plugin-marketplace.d.ts.map +1 -1
- package/dist/cli/plugin-marketplace.js +15 -1
- package/dist/cli/plugin-marketplace.js.map +1 -1
- package/dist/cli/setup.d.ts.map +1 -1
- package/dist/cli/setup.js +71 -11
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/sparkshell.d.ts +7 -1
- package/dist/cli/sparkshell.d.ts.map +1 -1
- package/dist/cli/sparkshell.js +13 -3
- package/dist/cli/sparkshell.js.map +1 -1
- package/dist/cli/ultragoal.d.ts +1 -1
- package/dist/cli/ultragoal.d.ts.map +1 -1
- package/dist/cli/ultragoal.js +184 -10
- package/dist/cli/ultragoal.js.map +1 -1
- package/dist/cli/update.d.ts +2 -0
- package/dist/cli/update.d.ts.map +1 -1
- package/dist/cli/update.js +14 -3
- package/dist/cli/update.js.map +1 -1
- package/dist/compat/__tests__/doctor-contract.test.js +3 -0
- package/dist/compat/__tests__/doctor-contract.test.js.map +1 -1
- package/dist/config/__tests__/codex-feature-flags.test.js +11 -1
- package/dist/config/__tests__/codex-feature-flags.test.js.map +1 -1
- package/dist/config/__tests__/codex-hooks.test.js +19 -8
- package/dist/config/__tests__/codex-hooks.test.js.map +1 -1
- package/dist/config/__tests__/commit-lore-guard.test.d.ts +2 -0
- package/dist/config/__tests__/commit-lore-guard.test.d.ts.map +1 -0
- package/dist/config/__tests__/commit-lore-guard.test.js +20 -0
- package/dist/config/__tests__/commit-lore-guard.test.js.map +1 -0
- package/dist/config/codex-feature-flags.d.ts +4 -0
- package/dist/config/codex-feature-flags.d.ts.map +1 -1
- package/dist/config/codex-feature-flags.js +4 -0
- package/dist/config/codex-feature-flags.js.map +1 -1
- package/dist/config/codex-hooks.js +6 -6
- package/dist/config/codex-hooks.js.map +1 -1
- package/dist/config/commit-lore-guard.d.ts +1 -0
- package/dist/config/commit-lore-guard.d.ts.map +1 -1
- package/dist/config/commit-lore-guard.js +29 -3
- package/dist/config/commit-lore-guard.js.map +1 -1
- package/dist/config/generator.d.ts +3 -1
- package/dist/config/generator.d.ts.map +1 -1
- package/dist/config/generator.js +24 -10
- package/dist/config/generator.js.map +1 -1
- package/dist/goal-workflows/codex-goal-snapshot.d.ts +1 -0
- package/dist/goal-workflows/codex-goal-snapshot.d.ts.map +1 -1
- package/dist/goal-workflows/codex-goal-snapshot.js +5 -1
- package/dist/goal-workflows/codex-goal-snapshot.js.map +1 -1
- package/dist/hooks/__tests__/autopilot-skill-contract.test.js +10 -6
- package/dist/hooks/__tests__/autopilot-skill-contract.test.js.map +1 -1
- package/dist/hooks/__tests__/consensus-execution-handoff.test.d.ts +1 -1
- package/dist/hooks/__tests__/consensus-execution-handoff.test.js +13 -11
- package/dist/hooks/__tests__/consensus-execution-handoff.test.js.map +1 -1
- package/dist/hooks/__tests__/deep-interview-contract.test.js +4 -3
- package/dist/hooks/__tests__/deep-interview-contract.test.js.map +1 -1
- package/dist/hooks/__tests__/keyword-detector.test.js +4 -3
- package/dist/hooks/__tests__/keyword-detector.test.js.map +1 -1
- package/dist/hooks/__tests__/notify-hook-team-tmux-guard.test.js +33 -0
- package/dist/hooks/__tests__/notify-hook-team-tmux-guard.test.js.map +1 -1
- package/dist/hooks/extensibility/__tests__/dispatcher.test.js +26 -3
- package/dist/hooks/extensibility/__tests__/dispatcher.test.js.map +1 -1
- package/dist/hooks/extensibility/dispatcher.d.ts.map +1 -1
- package/dist/hooks/extensibility/dispatcher.js +29 -14
- package/dist/hooks/extensibility/dispatcher.js.map +1 -1
- package/dist/hooks/keyword-detector.d.ts.map +1 -1
- package/dist/hooks/keyword-detector.js +8 -3
- package/dist/hooks/keyword-detector.js.map +1 -1
- package/dist/hooks/prompt-guidance-contract.d.ts.map +1 -1
- package/dist/hooks/prompt-guidance-contract.js +3 -2
- package/dist/hooks/prompt-guidance-contract.js.map +1 -1
- package/dist/hud/__tests__/hud-tmux-injection.test.js +14 -8
- package/dist/hud/__tests__/hud-tmux-injection.test.js.map +1 -1
- package/dist/hud/__tests__/reconcile.test.js +2 -2
- package/dist/hud/__tests__/reconcile.test.js.map +1 -1
- package/dist/hud/__tests__/resource-leak-watch.test.d.ts +2 -0
- package/dist/hud/__tests__/resource-leak-watch.test.d.ts.map +1 -0
- package/dist/hud/__tests__/resource-leak-watch.test.js +28 -0
- package/dist/hud/__tests__/resource-leak-watch.test.js.map +1 -0
- package/dist/hud/index.d.ts +1 -1
- package/dist/hud/index.d.ts.map +1 -1
- package/dist/hud/index.js +10 -4
- package/dist/hud/index.js.map +1 -1
- package/dist/hud/tmux.js +2 -2
- package/dist/hud/tmux.js.map +1 -1
- package/dist/notifications/__tests__/http-client-resource.test.d.ts +2 -0
- package/dist/notifications/__tests__/http-client-resource.test.d.ts.map +1 -0
- package/dist/notifications/__tests__/http-client-resource.test.js +41 -0
- package/dist/notifications/__tests__/http-client-resource.test.js.map +1 -0
- package/dist/notifications/__tests__/verbosity.test.js +20 -0
- package/dist/notifications/__tests__/verbosity.test.js.map +1 -1
- package/dist/notifications/config.d.ts.map +1 -1
- package/dist/notifications/config.js +6 -3
- package/dist/notifications/config.js.map +1 -1
- package/dist/notifications/http-client.d.ts.map +1 -1
- package/dist/notifications/http-client.js +78 -27
- package/dist/notifications/http-client.js.map +1 -1
- package/dist/notifications/types.d.ts +2 -0
- package/dist/notifications/types.d.ts.map +1 -1
- package/dist/openclaw/__tests__/dispatcher.test.js +49 -1
- package/dist/openclaw/__tests__/dispatcher.test.js.map +1 -1
- package/dist/openclaw/dispatcher.d.ts +7 -4
- package/dist/openclaw/dispatcher.d.ts.map +1 -1
- package/dist/openclaw/dispatcher.js +32 -69
- package/dist/openclaw/dispatcher.js.map +1 -1
- package/dist/pipeline/__tests__/orchestrator.test.js +65 -3
- package/dist/pipeline/__tests__/orchestrator.test.js.map +1 -1
- package/dist/pipeline/__tests__/stages.test.js +50 -5
- package/dist/pipeline/__tests__/stages.test.js.map +1 -1
- package/dist/pipeline/index.d.ts +8 -2
- package/dist/pipeline/index.d.ts.map +1 -1
- package/dist/pipeline/index.js +5 -2
- package/dist/pipeline/index.js.map +1 -1
- package/dist/pipeline/orchestrator.d.ts +5 -4
- package/dist/pipeline/orchestrator.d.ts.map +1 -1
- package/dist/pipeline/orchestrator.js +56 -15
- package/dist/pipeline/orchestrator.js.map +1 -1
- package/dist/pipeline/stages/code-review.d.ts +2 -2
- package/dist/pipeline/stages/code-review.d.ts.map +1 -1
- package/dist/pipeline/stages/code-review.js +5 -3
- package/dist/pipeline/stages/code-review.js.map +1 -1
- package/dist/pipeline/stages/deep-interview.d.ts +15 -0
- package/dist/pipeline/stages/deep-interview.d.ts.map +1 -0
- package/dist/pipeline/stages/deep-interview.js +32 -0
- package/dist/pipeline/stages/deep-interview.js.map +1 -0
- package/dist/pipeline/stages/ralph-verify.d.ts +5 -5
- package/dist/pipeline/stages/ralph-verify.d.ts.map +1 -1
- package/dist/pipeline/stages/ralph-verify.js +2 -2
- package/dist/pipeline/stages/ralph-verify.js.map +1 -1
- package/dist/pipeline/stages/ultragoal.d.ts +19 -0
- package/dist/pipeline/stages/ultragoal.d.ts.map +1 -0
- package/dist/pipeline/stages/ultragoal.js +38 -0
- package/dist/pipeline/stages/ultragoal.js.map +1 -0
- package/dist/pipeline/stages/ultraqa.d.ts +30 -0
- package/dist/pipeline/stages/ultraqa.d.ts.map +1 -0
- package/dist/pipeline/stages/ultraqa.js +46 -0
- package/dist/pipeline/stages/ultraqa.js.map +1 -0
- package/dist/pipeline/types.d.ts +8 -6
- package/dist/pipeline/types.d.ts.map +1 -1
- package/dist/pipeline/types.js +2 -2
- package/dist/scripts/__tests__/codex-native-hook.test.js +705 -45
- package/dist/scripts/__tests__/codex-native-hook.test.js.map +1 -1
- package/dist/scripts/__tests__/smoke-packed-install.test.js +23 -1
- package/dist/scripts/__tests__/smoke-packed-install.test.js.map +1 -1
- package/dist/scripts/__tests__/verify-native-agents.test.js +16 -1
- package/dist/scripts/__tests__/verify-native-agents.test.js.map +1 -1
- package/dist/scripts/cleanup-explore-harness.js +1 -0
- package/dist/scripts/cleanup-explore-harness.js.map +1 -1
- package/dist/scripts/codex-native-hook.d.ts.map +1 -1
- package/dist/scripts/codex-native-hook.js +158 -10
- package/dist/scripts/codex-native-hook.js.map +1 -1
- package/dist/scripts/codex-native-pre-post.d.ts.map +1 -1
- package/dist/scripts/codex-native-pre-post.js +9 -1
- package/dist/scripts/codex-native-pre-post.js.map +1 -1
- package/dist/scripts/notify-hook/process-runner.d.ts.map +1 -1
- package/dist/scripts/notify-hook/process-runner.js +39 -17
- package/dist/scripts/notify-hook/process-runner.js.map +1 -1
- package/dist/scripts/notify-hook/team-dispatch.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-dispatch.js +9 -5
- package/dist/scripts/notify-hook/team-dispatch.js.map +1 -1
- package/dist/scripts/notify-hook/team-tmux-guard.d.ts +1 -1
- package/dist/scripts/notify-hook/team-tmux-guard.d.ts.map +1 -1
- package/dist/scripts/notify-hook/team-tmux-guard.js +7 -1
- package/dist/scripts/notify-hook/team-tmux-guard.js.map +1 -1
- package/dist/scripts/smoke-packed-install.d.ts +3 -0
- package/dist/scripts/smoke-packed-install.d.ts.map +1 -1
- package/dist/scripts/smoke-packed-install.js +99 -1
- package/dist/scripts/smoke-packed-install.js.map +1 -1
- package/dist/scripts/sync-plugin-mirror.js +2 -2
- package/dist/scripts/sync-plugin-mirror.js.map +1 -1
- package/dist/scripts/verify-native-agents.js +2 -2
- package/dist/scripts/verify-native-agents.js.map +1 -1
- package/dist/sidecar/__tests__/resource-leak-watch.test.d.ts +2 -0
- package/dist/sidecar/__tests__/resource-leak-watch.test.d.ts.map +1 -0
- package/dist/sidecar/__tests__/resource-leak-watch.test.js +38 -0
- package/dist/sidecar/__tests__/resource-leak-watch.test.js.map +1 -0
- package/dist/sidecar/index.d.ts +1 -1
- package/dist/sidecar/index.d.ts.map +1 -1
- package/dist/sidecar/index.js +29 -12
- package/dist/sidecar/index.js.map +1 -1
- package/dist/state/__tests__/operations-ralph-phase.test.js +88 -1
- package/dist/state/__tests__/operations-ralph-phase.test.js.map +1 -1
- package/dist/state/operations.d.ts.map +1 -1
- package/dist/state/operations.js +11 -0
- package/dist/state/operations.js.map +1 -1
- package/dist/team/__tests__/tmux-session.test.js +111 -3
- package/dist/team/__tests__/tmux-session.test.js.map +1 -1
- package/dist/team/tmux-session.d.ts.map +1 -1
- package/dist/team/tmux-session.js +39 -18
- package/dist/team/tmux-session.js.map +1 -1
- package/dist/ultragoal/__tests__/artifacts.test.js +714 -10
- package/dist/ultragoal/__tests__/artifacts.test.js.map +1 -1
- package/dist/ultragoal/__tests__/docs-contract.test.js +57 -1
- package/dist/ultragoal/__tests__/docs-contract.test.js.map +1 -1
- package/dist/ultragoal/__tests__/steering-fixtures.d.ts +68 -0
- package/dist/ultragoal/__tests__/steering-fixtures.d.ts.map +1 -0
- package/dist/ultragoal/__tests__/steering-fixtures.js +259 -0
- package/dist/ultragoal/__tests__/steering-fixtures.js.map +1 -0
- package/dist/ultragoal/__tests__/steering-fixtures.test.d.ts +2 -0
- package/dist/ultragoal/__tests__/steering-fixtures.test.d.ts.map +1 -0
- package/dist/ultragoal/__tests__/steering-fixtures.test.js +65 -0
- package/dist/ultragoal/__tests__/steering-fixtures.test.js.map +1 -0
- package/dist/ultragoal/artifacts.d.ts +97 -2
- package/dist/ultragoal/artifacts.d.ts.map +1 -1
- package/dist/ultragoal/artifacts.js +811 -256
- package/dist/ultragoal/artifacts.js.map +1 -1
- package/dist/utils/__tests__/sleep-resource.test.d.ts +2 -0
- package/dist/utils/__tests__/sleep-resource.test.d.ts.map +1 -0
- package/dist/utils/__tests__/sleep-resource.test.js +39 -0
- package/dist/utils/__tests__/sleep-resource.test.js.map +1 -0
- package/dist/utils/sleep.d.ts.map +1 -1
- package/dist/utils/sleep.js +17 -6
- package/dist/utils/sleep.js.map +1 -1
- package/package.json +2 -1
- package/plugins/oh-my-codex/.codex-plugin/plugin.json +4 -3
- package/plugins/oh-my-codex/hooks/codex-native-hook.mjs +56 -0
- package/plugins/oh-my-codex/hooks/hooks.json +77 -0
- package/plugins/oh-my-codex/skills/autopilot/SKILL.md +77 -47
- package/plugins/oh-my-codex/skills/cancel/SKILL.md +2 -2
- package/plugins/oh-my-codex/skills/deep-interview/SKILL.md +8 -8
- package/plugins/oh-my-codex/skills/omx-setup/SKILL.md +1 -1
- package/plugins/oh-my-codex/skills/pipeline/SKILL.md +22 -11
- package/plugins/oh-my-codex/skills/plan/SKILL.md +8 -8
- package/plugins/oh-my-codex/skills/ralph/SKILL.md +7 -0
- package/plugins/oh-my-codex/skills/ralplan/SKILL.md +4 -4
- package/plugins/oh-my-codex/skills/team/SKILL.md +1 -1
- package/plugins/oh-my-codex/skills/ultragoal/SKILL.md +38 -4
- package/plugins/oh-my-codex/skills/ultrawork/SKILL.md +1 -1
- package/prompts/planner.md +1 -1
- package/skills/autopilot/SKILL.md +77 -47
- package/skills/cancel/SKILL.md +2 -2
- package/skills/deep-interview/SKILL.md +8 -8
- package/skills/omx-setup/SKILL.md +1 -1
- package/skills/pipeline/SKILL.md +22 -11
- package/skills/plan/SKILL.md +8 -8
- package/skills/ralph/SKILL.md +7 -0
- package/skills/ralplan/SKILL.md +4 -4
- package/skills/team/SKILL.md +1 -1
- package/skills/ultragoal/SKILL.md +38 -4
- package/skills/ultrawork/SKILL.md +1 -1
- package/src/scripts/__tests__/codex-native-hook.test.ts +867 -81
- package/src/scripts/__tests__/smoke-packed-install.test.ts +31 -0
- package/src/scripts/__tests__/verify-native-agents.test.ts +21 -1
- package/src/scripts/cleanup-explore-harness.ts +1 -0
- package/src/scripts/codex-native-hook.ts +156 -10
- package/src/scripts/codex-native-pre-post.ts +16 -1
- package/src/scripts/notify-hook/process-runner.ts +40 -16
- package/src/scripts/notify-hook/team-dispatch.ts +9 -5
- package/src/scripts/notify-hook/team-tmux-guard.ts +7 -0
- package/src/scripts/smoke-packed-install.ts +105 -0
- package/src/scripts/sync-plugin-mirror.ts +3 -3
- package/src/scripts/verify-native-agents.ts +2 -2
|
@@ -9,7 +9,7 @@ mod threshold;
|
|
|
9
9
|
|
|
10
10
|
use crate::codex_bridge::summarize_output;
|
|
11
11
|
use crate::error::SparkshellError;
|
|
12
|
-
use crate::exec::{execute_command,
|
|
12
|
+
use crate::exec::{execute_command, resolve_shell_argv, CommandOutput};
|
|
13
13
|
use crate::redaction::redact_output;
|
|
14
14
|
use crate::threshold::{combined_visible_lines, read_line_threshold};
|
|
15
15
|
use omx_mux::build_capture_pane_args;
|
|
@@ -65,6 +65,7 @@ struct CacheMeta {
|
|
|
65
65
|
const DEFAULT_BUDGET: usize = 1000;
|
|
66
66
|
const STALE_HEARTBEAT_MS: u64 = 120_000;
|
|
67
67
|
const DEFAULT_CACHE_TTL_MS: u64 = 10 * 60 * 1000;
|
|
68
|
+
const CACHE_BODY_VERSION: &str = "omx-sparkshell-cache-v2";
|
|
68
69
|
|
|
69
70
|
fn main() {
|
|
70
71
|
let args: Vec<String> = std::env::args().skip(1).collect();
|
|
@@ -85,9 +86,7 @@ fn run(args: Vec<String>) -> Result<(), SparkshellError> {
|
|
|
85
86
|
let options = parse_input(&args)?;
|
|
86
87
|
let execution_argv = match &options.target {
|
|
87
88
|
SparkShellTarget::Command(command) => command.clone(),
|
|
88
|
-
SparkShellTarget::Shell(script) =>
|
|
89
|
-
vec!["bash".to_string(), "-lc".to_string(), script.clone()]
|
|
90
|
-
}
|
|
89
|
+
SparkShellTarget::Shell(script) => resolve_shell_argv(script),
|
|
91
90
|
SparkShellTarget::TmuxPane {
|
|
92
91
|
pane_id,
|
|
93
92
|
tail_lines,
|
|
@@ -98,10 +97,7 @@ fn run(args: Vec<String>) -> Result<(), SparkshellError> {
|
|
|
98
97
|
}
|
|
99
98
|
};
|
|
100
99
|
|
|
101
|
-
let raw_output =
|
|
102
|
-
SparkShellTarget::Shell(script) => execute_shell_command(script)?,
|
|
103
|
-
_ => execute_command(&execution_argv)?,
|
|
104
|
-
};
|
|
100
|
+
let raw_output = execute_command(&execution_argv)?;
|
|
105
101
|
let redacted = redact_output(&raw_output);
|
|
106
102
|
let output = if options.json {
|
|
107
103
|
&redacted.output
|
|
@@ -122,8 +118,9 @@ fn run(args: Vec<String>) -> Result<(), SparkshellError> {
|
|
|
122
118
|
} else if cache_meta.as_ref().is_some_and(|meta| meta.cache_hit) {
|
|
123
119
|
"unchanged since previous observation".to_string()
|
|
124
120
|
} else {
|
|
125
|
-
summarize_output(&execution_argv, output)
|
|
126
|
-
|
|
121
|
+
summarize_output(&execution_argv, output).unwrap_or_else(|error| {
|
|
122
|
+
format!("summary unavailable: {error}; raw output omitted from JSON report")
|
|
123
|
+
})
|
|
127
124
|
};
|
|
128
125
|
write_json_report(
|
|
129
126
|
&options,
|
|
@@ -152,7 +149,7 @@ fn run(args: Vec<String>) -> Result<(), SparkshellError> {
|
|
|
152
149
|
}
|
|
153
150
|
Err(error) => {
|
|
154
151
|
write_raw_output(&output.stdout, &output.stderr)?;
|
|
155
|
-
eprintln!("omx sparkshell: summary unavailable ({error})");
|
|
152
|
+
eprintln!("omx sparkshell: summary unavailable ({error}); showing raw output instead");
|
|
156
153
|
}
|
|
157
154
|
}
|
|
158
155
|
|
|
@@ -174,9 +171,11 @@ fn usage_text() -> String {
|
|
|
174
171
|
format!(
|
|
175
172
|
concat!(
|
|
176
173
|
"usage: omx-sparkshell <command> [args...]\n",
|
|
174
|
+
" or: omx-sparkshell --shell <shell-command>\n",
|
|
177
175
|
" or: omx-sparkshell --tmux-pane <pane-id> [--tail-lines <{min}-{max}>]\n",
|
|
178
176
|
"\n",
|
|
179
177
|
"Direct command mode executes argv without shell metacharacter parsing.\n",
|
|
178
|
+
"Shell mode executes through bash -lc/sh -lc on POSIX and a native Windows shell on Windows.\n",
|
|
180
179
|
"Tmux pane mode captures a larger pane tail and applies the same raw-vs-summary behavior.\n"
|
|
181
180
|
),
|
|
182
181
|
min = MIN_TMUX_TAIL_LINES,
|
|
@@ -532,9 +531,7 @@ fn handle_cache(
|
|
|
532
531
|
return Ok(None);
|
|
533
532
|
}
|
|
534
533
|
let key = match &options.target {
|
|
535
|
-
SparkShellTarget::TmuxPane { pane_id, .. } =>
|
|
536
|
-
format!("pane-{}", pane_id.replace('%', "pct"))
|
|
537
|
-
}
|
|
534
|
+
SparkShellTarget::TmuxPane { pane_id, .. } => pane_cache_key(pane_id),
|
|
538
535
|
SparkShellTarget::Command(_) | SparkShellTarget::Shell(_) => return Ok(None),
|
|
539
536
|
};
|
|
540
537
|
let dir = cache_dir();
|
|
@@ -547,6 +544,27 @@ fn handle_cache(
|
|
|
547
544
|
)
|
|
548
545
|
}
|
|
549
546
|
|
|
547
|
+
fn pane_cache_key(pane_id: &str) -> String {
|
|
548
|
+
let percent_escaped = pane_id.replace('%', "pct");
|
|
549
|
+
if percent_escaped
|
|
550
|
+
.bytes()
|
|
551
|
+
.all(|byte| byte.is_ascii_alphanumeric() || matches!(byte, b'-' | b'_' | b'.'))
|
|
552
|
+
{
|
|
553
|
+
return format!("pane-{percent_escaped}");
|
|
554
|
+
}
|
|
555
|
+
|
|
556
|
+
format!("pane-h{:016x}", fnv1a64(pane_id.as_bytes()))
|
|
557
|
+
}
|
|
558
|
+
|
|
559
|
+
fn fnv1a64(bytes: &[u8]) -> u64 {
|
|
560
|
+
let mut hash = 0xcbf2_9ce4_8422_2325;
|
|
561
|
+
for byte in bytes {
|
|
562
|
+
hash ^= u64::from(*byte);
|
|
563
|
+
hash = hash.wrapping_mul(0x0000_0100_0000_01b3);
|
|
564
|
+
}
|
|
565
|
+
hash
|
|
566
|
+
}
|
|
567
|
+
|
|
550
568
|
fn handle_cache_at_path(
|
|
551
569
|
path: &Path,
|
|
552
570
|
output: &CommandOutput,
|
|
@@ -555,6 +573,7 @@ fn handle_cache_at_path(
|
|
|
555
573
|
) -> Result<Option<CacheMeta>, SparkshellError> {
|
|
556
574
|
let now = now_ms();
|
|
557
575
|
let current = combined_text(output);
|
|
576
|
+
let current_line_count = current.lines().count();
|
|
558
577
|
let mut previous_hash = None;
|
|
559
578
|
let mut cache_hit = false;
|
|
560
579
|
let mut changed_line_ranges = Vec::new();
|
|
@@ -567,14 +586,23 @@ fn handle_cache_at_path(
|
|
|
567
586
|
let old_hash = parts.next().unwrap_or("").to_string();
|
|
568
587
|
let old_body = parts.next().unwrap_or("");
|
|
569
588
|
if now.saturating_sub(timestamp) <= ttl_ms {
|
|
589
|
+
let old_line_count = cached_line_count(old_body);
|
|
570
590
|
previous_hash = Some(old_hash.clone());
|
|
571
591
|
cache_hit = old_hash == current_hash;
|
|
572
592
|
if !cache_hit {
|
|
573
|
-
changed_line_ranges = changed_ranges(
|
|
593
|
+
changed_line_ranges = changed_ranges(
|
|
594
|
+
old_hash.as_str(),
|
|
595
|
+
current_hash,
|
|
596
|
+
old_line_count,
|
|
597
|
+
current_line_count,
|
|
598
|
+
);
|
|
574
599
|
}
|
|
575
600
|
}
|
|
576
601
|
}
|
|
577
|
-
fs::write(
|
|
602
|
+
fs::write(
|
|
603
|
+
path,
|
|
604
|
+
cache_contents(now, current_hash, output, current_line_count),
|
|
605
|
+
)?;
|
|
578
606
|
Ok(Some(CacheMeta {
|
|
579
607
|
cache_hit,
|
|
580
608
|
previous_hash,
|
|
@@ -583,6 +611,30 @@ fn handle_cache_at_path(
|
|
|
583
611
|
}))
|
|
584
612
|
}
|
|
585
613
|
|
|
614
|
+
fn cache_contents(
|
|
615
|
+
timestamp_ms: u64,
|
|
616
|
+
current_hash: &str,
|
|
617
|
+
output: &CommandOutput,
|
|
618
|
+
current_line_count: usize,
|
|
619
|
+
) -> String {
|
|
620
|
+
format!(
|
|
621
|
+
"{timestamp_ms}\n{current_hash}\n{CACHE_BODY_VERSION}\nlines={current_line_count}\nstdout_lines={}\nstderr_lines={}\n",
|
|
622
|
+
String::from_utf8_lossy(&output.stdout).lines().count(),
|
|
623
|
+
String::from_utf8_lossy(&output.stderr).lines().count()
|
|
624
|
+
)
|
|
625
|
+
}
|
|
626
|
+
|
|
627
|
+
fn cached_line_count(body: &str) -> usize {
|
|
628
|
+
if let Some(metadata) = body.strip_prefix(CACHE_BODY_VERSION) {
|
|
629
|
+
return metadata
|
|
630
|
+
.lines()
|
|
631
|
+
.find_map(|line| line.strip_prefix("lines="))
|
|
632
|
+
.and_then(|value| value.parse::<usize>().ok())
|
|
633
|
+
.unwrap_or(0);
|
|
634
|
+
}
|
|
635
|
+
body.lines().count()
|
|
636
|
+
}
|
|
637
|
+
|
|
586
638
|
fn since_last_summary(output: &CommandOutput, cache: Option<&CacheMeta>, budget: usize) -> String {
|
|
587
639
|
let Some(cache) = cache else {
|
|
588
640
|
return compact_text(&combined_text(output), budget);
|
|
@@ -622,12 +674,15 @@ fn since_last_summary(output: &CommandOutput, cache: Option<&CacheMeta>, budget:
|
|
|
622
674
|
}
|
|
623
675
|
}
|
|
624
676
|
|
|
625
|
-
fn changed_ranges(
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
677
|
+
fn changed_ranges(
|
|
678
|
+
old_hash: &str,
|
|
679
|
+
current_hash: &str,
|
|
680
|
+
old_line_count: usize,
|
|
681
|
+
current_line_count: usize,
|
|
682
|
+
) -> Vec<String> {
|
|
683
|
+
if current_line_count > old_line_count {
|
|
684
|
+
vec![format!("{}-{}", old_line_count + 1, current_line_count)]
|
|
685
|
+
} else if old_hash != current_hash {
|
|
631
686
|
vec!["1-*".to_string()]
|
|
632
687
|
} else {
|
|
633
688
|
Vec::new()
|
|
@@ -722,28 +777,63 @@ fn classify_team(team: &str, worker: &str) -> Option<Diagnostics> {
|
|
|
722
777
|
}
|
|
723
778
|
|
|
724
779
|
if let Ok(status) = fs::read_to_string(base.join("status.json")) {
|
|
725
|
-
let
|
|
726
|
-
|
|
727
|
-
return Some(Diagnostics {
|
|
728
|
-
classification: "waiting_for_input".to_string(),
|
|
729
|
-
next_action: "inspect raw pane".to_string(),
|
|
730
|
-
confidence: 0.7,
|
|
731
|
-
errors: Vec::new(),
|
|
732
|
-
warnings: Vec::new(),
|
|
733
|
-
});
|
|
780
|
+
if let Some(diagnostics) = classify_worker_status(&status) {
|
|
781
|
+
return Some(diagnostics);
|
|
734
782
|
}
|
|
735
|
-
|
|
736
|
-
|
|
783
|
+
}
|
|
784
|
+
|
|
785
|
+
None
|
|
786
|
+
}
|
|
787
|
+
|
|
788
|
+
fn classify_worker_status(status: &str) -> Option<Diagnostics> {
|
|
789
|
+
// Keep this mapping aligned with the WorkerStatus.state union in src/team/state.ts.
|
|
790
|
+
let state = extract_json_string(status, "state")
|
|
791
|
+
.map(|value| value.to_ascii_lowercase())
|
|
792
|
+
.unwrap_or_else(|| status.to_ascii_lowercase());
|
|
793
|
+
|
|
794
|
+
match state.as_str() {
|
|
795
|
+
"working" | "busy" | "in_progress" => Some(Diagnostics {
|
|
796
|
+
classification: "busy_processing".to_string(),
|
|
797
|
+
next_action: "wait".to_string(),
|
|
798
|
+
confidence: 0.72,
|
|
799
|
+
errors: Vec::new(),
|
|
800
|
+
warnings: vec!["do not shutdown yet".to_string()],
|
|
801
|
+
}),
|
|
802
|
+
"blocked" | "needs_input" => Some(Diagnostics {
|
|
803
|
+
classification: "waiting_for_input".to_string(),
|
|
804
|
+
next_action: "inspect raw pane".to_string(),
|
|
805
|
+
confidence: 0.7,
|
|
806
|
+
errors: Vec::new(),
|
|
807
|
+
warnings: Vec::new(),
|
|
808
|
+
}),
|
|
809
|
+
"failed" => Some(Diagnostics {
|
|
810
|
+
classification: "test_failure".to_string(),
|
|
811
|
+
next_action: "inspect raw pane".to_string(),
|
|
812
|
+
confidence: 0.7,
|
|
813
|
+
errors: vec!["worker status is failed".to_string()],
|
|
814
|
+
warnings: Vec::new(),
|
|
815
|
+
}),
|
|
816
|
+
_ if state.contains("working")
|
|
817
|
+
|| state.contains("busy")
|
|
818
|
+
|| state.contains("in_progress") =>
|
|
819
|
+
{
|
|
820
|
+
Some(Diagnostics {
|
|
737
821
|
classification: "busy_processing".to_string(),
|
|
738
822
|
next_action: "wait".to_string(),
|
|
739
823
|
confidence: 0.72,
|
|
740
824
|
errors: Vec::new(),
|
|
741
825
|
warnings: vec!["do not shutdown yet".to_string()],
|
|
742
|
-
})
|
|
826
|
+
})
|
|
743
827
|
}
|
|
828
|
+
_ if state.contains("blocked") || state.contains("needs_input") => Some(Diagnostics {
|
|
829
|
+
classification: "waiting_for_input".to_string(),
|
|
830
|
+
next_action: "inspect raw pane".to_string(),
|
|
831
|
+
confidence: 0.7,
|
|
832
|
+
errors: Vec::new(),
|
|
833
|
+
warnings: Vec::new(),
|
|
834
|
+
}),
|
|
835
|
+
_ => None,
|
|
744
836
|
}
|
|
745
|
-
|
|
746
|
-
None
|
|
747
837
|
}
|
|
748
838
|
|
|
749
839
|
fn extract_heartbeat_ms(text: &str) -> Option<u64> {
|
|
@@ -254,6 +254,7 @@ fn summary_failure_falls_back_to_raw_output_with_notice() {
|
|
|
254
254
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
255
255
|
assert!(stderr.contains("child-err"));
|
|
256
256
|
assert!(stderr.contains("summary unavailable"));
|
|
257
|
+
assert!(stderr.contains("showing raw output instead"));
|
|
257
258
|
}
|
|
258
259
|
|
|
259
260
|
#[test]
|
|
@@ -478,6 +479,32 @@ fn summary_failure_when_api_is_missing_falls_back_to_raw_output() {
|
|
|
478
479
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
479
480
|
assert!(stderr.contains("child-err"));
|
|
480
481
|
assert!(stderr.contains("summary unavailable"));
|
|
482
|
+
assert!(stderr.contains("showing raw output instead"));
|
|
483
|
+
}
|
|
484
|
+
|
|
485
|
+
#[test]
|
|
486
|
+
fn json_summary_failure_reports_raw_output_omitted() {
|
|
487
|
+
let (base_url, server) = start_api_server(1, |_request| {
|
|
488
|
+
(503, "{\"error\":\"bridge failed\"}".to_string())
|
|
489
|
+
});
|
|
490
|
+
|
|
491
|
+
let output = Command::new(sparkshell_bin())
|
|
492
|
+
.env("OMX_API_BASE_URL", base_url)
|
|
493
|
+
.env("OMX_SPARKSHELL_LINES", "1")
|
|
494
|
+
.arg("--json")
|
|
495
|
+
.arg("sh")
|
|
496
|
+
.arg("-c")
|
|
497
|
+
.arg("printf 'one\ntwo\n'")
|
|
498
|
+
.output()
|
|
499
|
+
.expect("run sparkshell");
|
|
500
|
+
server.join().expect("api server");
|
|
501
|
+
|
|
502
|
+
assert!(output.status.success());
|
|
503
|
+
let stdout = String::from_utf8_lossy(&output.stdout);
|
|
504
|
+
assert!(stdout.contains("summary unavailable"));
|
|
505
|
+
assert!(stdout.contains("raw output omitted from JSON report"));
|
|
506
|
+
assert!(!stdout.contains("raw output included"));
|
|
507
|
+
assert!(String::from_utf8_lossy(&output.stderr).is_empty());
|
|
481
508
|
}
|
|
482
509
|
|
|
483
510
|
#[test]
|
|
@@ -616,6 +643,11 @@ fn team_diagnostics_reads_last_turn_at_heartbeat() {
|
|
|
616
643
|
r#"{"last_turn_at":"1970-01-01T00:00:00.000Z"}"#,
|
|
617
644
|
)
|
|
618
645
|
.expect("heartbeat");
|
|
646
|
+
fs::write(
|
|
647
|
+
worker_dir.join("status.json"),
|
|
648
|
+
r#"{"state":"working","current_task_id":"1","updated_at":"2026-05-17T20:00:00.000Z"}"#,
|
|
649
|
+
)
|
|
650
|
+
.expect("status");
|
|
619
651
|
|
|
620
652
|
let output = Command::new(sparkshell_bin())
|
|
621
653
|
.env("OMX_TEAM_STATE_ROOT", temp.display().to_string())
|
|
@@ -636,6 +668,74 @@ fn team_diagnostics_reads_last_turn_at_heartbeat() {
|
|
|
636
668
|
let _ = fs::remove_dir_all(temp);
|
|
637
669
|
}
|
|
638
670
|
|
|
671
|
+
fn run_team_status_diagnostics(status_json: &str) -> String {
|
|
672
|
+
let temp = unique_temp_dir("team-status");
|
|
673
|
+
let worker_dir = temp.join("team/demo/workers/worker-1");
|
|
674
|
+
fs::create_dir_all(&worker_dir).expect("worker dir");
|
|
675
|
+
fs::write(worker_dir.join("status.json"), status_json).expect("status");
|
|
676
|
+
|
|
677
|
+
let output = Command::new(sparkshell_bin())
|
|
678
|
+
.env("OMX_TEAM_STATE_ROOT", temp.display().to_string())
|
|
679
|
+
.arg("--json")
|
|
680
|
+
.arg("--team")
|
|
681
|
+
.arg("demo")
|
|
682
|
+
.arg("--worker")
|
|
683
|
+
.arg("worker-1")
|
|
684
|
+
.arg("sh")
|
|
685
|
+
.arg("-c")
|
|
686
|
+
.arg("printf 'quiet\n'")
|
|
687
|
+
.output()
|
|
688
|
+
.expect("run sparkshell");
|
|
689
|
+
|
|
690
|
+
let _ = fs::remove_dir_all(temp);
|
|
691
|
+
assert!(output.status.success());
|
|
692
|
+
String::from_utf8_lossy(&output.stdout).into_owned()
|
|
693
|
+
}
|
|
694
|
+
|
|
695
|
+
#[test]
|
|
696
|
+
fn json_mode_treats_worker_status_working_as_busy() {
|
|
697
|
+
let stdout = run_team_status_diagnostics(
|
|
698
|
+
r#"{"state":"working","current_task_id":"1","updated_at":"2026-05-17T20:00:00.000Z"}"#,
|
|
699
|
+
);
|
|
700
|
+
|
|
701
|
+
assert!(stdout.contains("\"classification\": \"busy_processing\""));
|
|
702
|
+
assert!(stdout.contains("\"next_action\": \"wait\""));
|
|
703
|
+
assert!(stdout.contains("do not shutdown yet"));
|
|
704
|
+
assert!(!stdout.contains("\"classification\": \"unknown\""));
|
|
705
|
+
}
|
|
706
|
+
|
|
707
|
+
#[test]
|
|
708
|
+
fn json_mode_reports_blocked_worker_status() {
|
|
709
|
+
let stdout = run_team_status_diagnostics(
|
|
710
|
+
r#"{"state":"blocked","updated_at":"2026-05-17T20:00:00.000Z"}"#,
|
|
711
|
+
);
|
|
712
|
+
|
|
713
|
+
assert!(stdout.contains("\"classification\": \"waiting_for_input\""));
|
|
714
|
+
assert!(stdout.contains("\"next_action\": \"inspect raw pane\""));
|
|
715
|
+
}
|
|
716
|
+
|
|
717
|
+
#[test]
|
|
718
|
+
fn json_mode_reports_failed_worker_status() {
|
|
719
|
+
let stdout = run_team_status_diagnostics(
|
|
720
|
+
r#"{"state":"failed","updated_at":"2026-05-17T20:00:00.000Z"}"#,
|
|
721
|
+
);
|
|
722
|
+
|
|
723
|
+
assert!(stdout.contains("\"classification\": \"test_failure\""));
|
|
724
|
+
assert!(stdout.contains("worker status is failed"));
|
|
725
|
+
}
|
|
726
|
+
|
|
727
|
+
#[test]
|
|
728
|
+
fn json_mode_leaves_inactive_worker_statuses_to_output_heuristics() {
|
|
729
|
+
for state in ["idle", "done", "draining", "unknown"] {
|
|
730
|
+
let stdout = run_team_status_diagnostics(&format!(
|
|
731
|
+
r#"{{"state":"{state}","updated_at":"2026-05-17T20:00:00.000Z"}}"#
|
|
732
|
+
));
|
|
733
|
+
|
|
734
|
+
assert!(stdout.contains("\"classification\": \"unknown\""));
|
|
735
|
+
assert!(!stdout.contains("do not shutdown yet"));
|
|
736
|
+
}
|
|
737
|
+
}
|
|
738
|
+
|
|
639
739
|
#[test]
|
|
640
740
|
fn json_mode_reads_team_state_from_env_root() {
|
|
641
741
|
let temp = unique_temp_dir("team-state");
|
|
@@ -723,6 +823,130 @@ fn pane_json_cache_reports_hits_and_since_last_changes() {
|
|
|
723
823
|
let _ = fs::remove_dir_all(temp);
|
|
724
824
|
}
|
|
725
825
|
|
|
826
|
+
#[test]
|
|
827
|
+
fn pane_cache_key_does_not_escape_cache_dir_for_path_like_pane_ids() {
|
|
828
|
+
let temp = unique_temp_dir("pane-cache-traversal");
|
|
829
|
+
let tmux = temp.join("tmux");
|
|
830
|
+
let cache = temp.join("cache");
|
|
831
|
+
let intermediate = cache.join("pane-..");
|
|
832
|
+
let outside = temp.join("outside-pr2371.txt");
|
|
833
|
+
|
|
834
|
+
fs::create_dir_all(&intermediate).expect("intermediate cache dir");
|
|
835
|
+
write_executable(
|
|
836
|
+
&tmux,
|
|
837
|
+
"#!/bin/sh
|
|
838
|
+
printf 'safe pane output
|
|
839
|
+
'
|
|
840
|
+
",
|
|
841
|
+
);
|
|
842
|
+
let path = format!(
|
|
843
|
+
"{}:{}",
|
|
844
|
+
temp.display(),
|
|
845
|
+
env::var("PATH").unwrap_or_default()
|
|
846
|
+
);
|
|
847
|
+
|
|
848
|
+
let output = Command::new(sparkshell_bin())
|
|
849
|
+
.env("PATH", &path)
|
|
850
|
+
.env("OMX_SPARKSHELL_CACHE_DIR", cache.display().to_string())
|
|
851
|
+
.arg("--json")
|
|
852
|
+
.arg("--tmux-pane")
|
|
853
|
+
.arg("../../../outside-pr2371")
|
|
854
|
+
.output()
|
|
855
|
+
.expect("run sparkshell");
|
|
856
|
+
|
|
857
|
+
assert!(
|
|
858
|
+
output.status.success(),
|
|
859
|
+
"sparkshell failed: stdout={} stderr={}",
|
|
860
|
+
String::from_utf8_lossy(&output.stdout),
|
|
861
|
+
String::from_utf8_lossy(&output.stderr)
|
|
862
|
+
);
|
|
863
|
+
assert!(
|
|
864
|
+
!outside.exists(),
|
|
865
|
+
"path-like pane id wrote outside cache dir at {}",
|
|
866
|
+
outside.display()
|
|
867
|
+
);
|
|
868
|
+
|
|
869
|
+
let cache_files = fs::read_dir(&cache)
|
|
870
|
+
.expect("cache dir")
|
|
871
|
+
.map(|entry| entry.expect("cache entry").path())
|
|
872
|
+
.collect::<Vec<_>>();
|
|
873
|
+
assert!(
|
|
874
|
+
cache_files.iter().any(|path| {
|
|
875
|
+
path.is_file()
|
|
876
|
+
&& path.parent() == Some(cache.as_path())
|
|
877
|
+
&& path
|
|
878
|
+
.file_name()
|
|
879
|
+
.and_then(|name| name.to_str())
|
|
880
|
+
.is_some_and(|name| name.starts_with("pane-h") && name.ends_with(".txt"))
|
|
881
|
+
}),
|
|
882
|
+
"expected sanitized pane cache file directly under cache dir, got {cache_files:?}"
|
|
883
|
+
);
|
|
884
|
+
|
|
885
|
+
let _ = fs::remove_dir_all(temp);
|
|
886
|
+
}
|
|
887
|
+
|
|
888
|
+
#[test]
|
|
889
|
+
fn pane_cache_does_not_persist_raw_secret_like_text() {
|
|
890
|
+
let temp = unique_temp_dir("pane-cache-secret");
|
|
891
|
+
let tmux = temp.join("tmux");
|
|
892
|
+
let cache = temp.join("cache");
|
|
893
|
+
let pane = temp.join("pane.txt");
|
|
894
|
+
let secret_line = "OPENAI_API_KEY=sk-test-secret";
|
|
895
|
+
fs::write(
|
|
896
|
+
&pane,
|
|
897
|
+
format!(
|
|
898
|
+
"starting
|
|
899
|
+
{secret_line}
|
|
900
|
+
finished
|
|
901
|
+
"
|
|
902
|
+
),
|
|
903
|
+
)
|
|
904
|
+
.expect("pane");
|
|
905
|
+
write_executable(
|
|
906
|
+
&tmux,
|
|
907
|
+
&format!(
|
|
908
|
+
"#!/bin/sh
|
|
909
|
+
cat {}
|
|
910
|
+
",
|
|
911
|
+
pane.display()
|
|
912
|
+
),
|
|
913
|
+
);
|
|
914
|
+
let path = format!(
|
|
915
|
+
"{}:{}",
|
|
916
|
+
temp.display(),
|
|
917
|
+
env::var("PATH").unwrap_or_default()
|
|
918
|
+
);
|
|
919
|
+
|
|
920
|
+
let output = Command::new(sparkshell_bin())
|
|
921
|
+
.env("PATH", &path)
|
|
922
|
+
.env("OMX_SPARKSHELL_CACHE_DIR", cache.display().to_string())
|
|
923
|
+
.arg("--json")
|
|
924
|
+
.arg("--tmux-pane")
|
|
925
|
+
.arg("%99")
|
|
926
|
+
.output()
|
|
927
|
+
.expect("run sparkshell");
|
|
928
|
+
|
|
929
|
+
assert!(output.status.success());
|
|
930
|
+
let cache_file = cache.join("pane-pct99.txt");
|
|
931
|
+
let cached = fs::read_to_string(&cache_file).expect("cache file");
|
|
932
|
+
assert!(
|
|
933
|
+
!cached.contains(secret_line),
|
|
934
|
+
"cache file persisted raw secret-like pane text: {cached}"
|
|
935
|
+
);
|
|
936
|
+
assert!(
|
|
937
|
+
!cached.contains("sk-test-secret"),
|
|
938
|
+
"cache file persisted raw token value: {cached}"
|
|
939
|
+
);
|
|
940
|
+
assert!(
|
|
941
|
+
!cached.contains("OPENAI_API_KEY"),
|
|
942
|
+
"cache file persisted raw secret variable name: {cached}"
|
|
943
|
+
);
|
|
944
|
+
assert!(cached.contains("omx-sparkshell-cache-v2"));
|
|
945
|
+
assert!(cached.contains("lines=3"));
|
|
946
|
+
|
|
947
|
+
let _ = fs::remove_dir_all(temp);
|
|
948
|
+
}
|
|
949
|
+
|
|
726
950
|
#[test]
|
|
727
951
|
fn raw_mode_preserves_non_utf8_bytes() {
|
|
728
952
|
let temp = unique_temp_dir("raw-non-utf8");
|
|
@@ -758,5 +982,5 @@ fn shell_mode_executes_explicit_shell_and_redacts_json_output() {
|
|
|
758
982
|
assert!(stdout.contains("\"mode\": \"shell\""));
|
|
759
983
|
assert!(stdout.contains("left && right"));
|
|
760
984
|
assert!(stdout.contains("Authorization: Bearer [REDACTED]"));
|
|
761
|
-
assert!(stdout.contains("
|
|
985
|
+
assert!(stdout.contains(r#""redactions": {"count": 1}"#));
|
|
762
986
|
}
|
|
@@ -13,6 +13,7 @@ const pluginRoot = join(root, 'plugins', pluginName);
|
|
|
13
13
|
const pluginManifestPath = join(pluginRoot, '.codex-plugin', 'plugin.json');
|
|
14
14
|
const pluginMcpPath = join(pluginRoot, '.mcp.json');
|
|
15
15
|
const pluginAppsPath = join(pluginRoot, '.app.json');
|
|
16
|
+
const pluginHooksPath = join(pluginRoot, 'hooks', 'hooks.json');
|
|
16
17
|
const marketplacePath = join(root, '.agents', 'plugins', 'marketplace.json');
|
|
17
18
|
const omxBin = join(root, 'dist', 'cli', 'omx.js');
|
|
18
19
|
async function readJson(path) {
|
|
@@ -87,17 +88,23 @@ describe('official Codex plugin layout', () => {
|
|
|
87
88
|
assert.ok(manifest.interface?.longDescription, 'expected long interface description');
|
|
88
89
|
assert.ok(manifest.interface?.developerName, 'expected developerName');
|
|
89
90
|
});
|
|
90
|
-
it('ships disabled-by-default
|
|
91
|
-
const [mcpManifest, appsManifest] = await Promise.all([
|
|
91
|
+
it('ships plugin-scoped hooks and disabled-by-default MCP compatibility metadata', async () => {
|
|
92
|
+
const [mcpManifest, appsManifest, hooksManifest] = await Promise.all([
|
|
92
93
|
readJson(pluginMcpPath),
|
|
93
94
|
readJson(pluginAppsPath),
|
|
95
|
+
readJson(pluginHooksPath),
|
|
94
96
|
]);
|
|
95
97
|
const expectedPluginMcpManifest = buildOmxPluginMcpManifest();
|
|
96
98
|
const pluginManifest = await readJson(pluginManifestPath);
|
|
97
99
|
assert.equal(pluginManifest.agents, undefined);
|
|
98
100
|
assert.equal(pluginManifest.prompts, undefined);
|
|
99
|
-
assert.equal(pluginManifest.hooks,
|
|
101
|
+
assert.equal(pluginManifest.hooks, './hooks/hooks.json');
|
|
100
102
|
assert.deepEqual(appsManifest, { apps: {} });
|
|
103
|
+
const hookCommands = Object.values(hooksManifest.hooks ?? {})
|
|
104
|
+
.flatMap((entries) => entries)
|
|
105
|
+
.flatMap((entry) => entry.hooks ?? [])
|
|
106
|
+
.map((hook) => hook.command);
|
|
107
|
+
assert.ok(hookCommands.every((command) => command === 'node "${PLUGIN_ROOT}/hooks/codex-native-hook.mjs"'), 'plugin hooks should use Codex PLUGIN_ROOT instead of setup-owned .codex/hooks.json');
|
|
101
108
|
assert.deepEqual(mcpManifest, expectedPluginMcpManifest);
|
|
102
109
|
for (const [serverName, server] of Object.entries(mcpManifest.mcpServers ?? {})) {
|
|
103
110
|
assert.equal(server.command, OMX_PLUGIN_MCP_COMMAND, `${serverName} should run via omx`);
|
|
@@ -135,11 +142,12 @@ describe('official Codex plugin layout', () => {
|
|
|
135
142
|
await assertPluginCacheLaunchable(target);
|
|
136
143
|
}
|
|
137
144
|
});
|
|
138
|
-
it('does not stage
|
|
145
|
+
it('does not stage setup-owned hook or runtime directories inside the plugin', async () => {
|
|
139
146
|
const pluginEntries = await readdir(pluginRoot);
|
|
140
147
|
assert.equal(pluginEntries.includes('.codex'), false, 'official plugin should not ship setup-owned .codex hook assets');
|
|
141
148
|
assert.equal(pluginEntries.includes('.omx'), false, 'official plugin should not ship runtime hook directories');
|
|
142
|
-
assert.equal(pluginEntries.includes('hooks.json'), false, 'official plugin
|
|
149
|
+
assert.equal(pluginEntries.includes('hooks.json'), false, 'official plugin hook metadata should stay under hooks/');
|
|
150
|
+
assert.equal(pluginEntries.includes('hooks'), true, 'official plugin should ship plugin-scoped lifecycle hooks');
|
|
143
151
|
});
|
|
144
152
|
it('registers the plugin in the repo marketplace with explicit source, policy, and category', async () => {
|
|
145
153
|
const marketplace = await readJson(marketplacePath);
|
|
@@ -209,8 +217,8 @@ describe('official Codex plugin layout', () => {
|
|
|
209
217
|
assert.match(combined, /plugins\/cache\/\$MARKETPLACE_NAME\/oh-my-codex\/\$VERSION\//);
|
|
210
218
|
assert.match(combined, /not a replacement for `npm install -g oh-my-codex` plus `omx setup`/);
|
|
211
219
|
assert.match(combined, /legacy setup mode installs native agents(?:\/| and )prompts|plugin setup mode archives stale legacy prompt\/native-agent files/);
|
|
212
|
-
assert.match(combined, /plugin-scoped companion metadata for
|
|
213
|
-
assert.match(combined, /
|
|
220
|
+
assert.match(combined, /plugin-scoped companion metadata for official Codex lifecycle hooks/i);
|
|
221
|
+
assert.match(combined, /legacy\/fallback native Codex hook registrations|legacy setup mode installs prompts\/native agents and \.codex\/hooks\.json/i);
|
|
214
222
|
});
|
|
215
223
|
});
|
|
216
224
|
//# sourceMappingURL=codex-plugin-layout.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-plugin-layout.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/codex-plugin-layout.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-plugin-layout.test.js","sourceRoot":"","sources":["../../../src/cli/__tests__/codex-plugin-layout.test.ts"],"names":[],"mappings":"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"}
|