fix(omp): keep skillopt staging durable

Author: edmundmiller

modules/agents/omp/default.nix

@@ -72,12 +72,20 @@ let
     hash = "sha256-9E9qa+rdFsyUcE1N2QiMeOeG0NpDuqu5SaeabbcScaI=";
   };
   skilloptSleepPlugin = ../../../packages/pi-packages/omp-skillopt-sleep;
-  skilloptSleepSource = pkgs.fetchFromGitHub {
+  skilloptSleepUpstream = pkgs.fetchFromGitHub {
     owner = "microsoft";
     repo = "SkillOpt";
     rev = "e4ea6a6771e797ef820cdd8bfea64c57e0481065";
     hash = "sha256-WVvnOO5B0pUvqmp1GNz3KpFoMkm8z/MPKevZz0jMleQ=";
   };
+  skilloptSleepSource = pkgs.runCommand "skillopt-sleep-source-omp-staging" { } ''
+    cp -R ${skilloptSleepUpstream} "$out"
+    chmod -R u+w "$out"
+    substituteInPlace "$out/skillopt_sleep/staging.py" \
+      --replace-fail \
+        'return os.path.join(project, ".skillopt-sleep", "staging")' \
+        'return os.environ.get("SKILLOPT_SLEEP_STAGING_ROOT") or os.path.join(project, ".skillopt-sleep", "staging")'
+  '';
   ompPackage = pkgs.stdenvNoCC.mkDerivation {
     name = "${cfg.package.pname or "omp"}-isolated";
     dontUnpack = true;
@@ -98,6 +106,8 @@ let
         --set PI_CONFIG_DIR ${lib.escapeShellArg ompConfigDir} \
         --set PI_CODING_AGENT_DIR ${lib.escapeShellArg ompAgentDir} \
         --set PONYTAIL_DEFAULT_MODE full \
+        --set SKILLOPT_SLEEP_REPO ${lib.escapeShellArg "${skilloptSleepSource}"} \
+        --set SKILLOPT_SLEEP_STAGING_ROOT ${lib.escapeShellArg "${config.user.home}/.skillopt-sleep/omp/staging"} \
         --set PI_PERMISSION_SYSTEM_CONFIG_PATH ${lib.escapeShellArg "${ompAgentDir}/extensions/pi-permission-system/config.json"}${
           lib.optionalString (
             cfg.smolModel != null
@@ -124,6 +134,7 @@ let
 
     export HOME=${lib.escapeShellArg config.user.home}
     export SKILLOPT_SLEEP_REPO=${lib.escapeShellArg "${skilloptSleepSource}"}
+    export SKILLOPT_SLEEP_STAGING_ROOT=${lib.escapeShellArg "${config.user.home}/.skillopt-sleep/omp/staging"}
 
     cd ${lib.escapeShellArg "${config.user.home}/.config/dotfiles"}
     ${pkgs.python3}/bin/python3 ${lib.escapeShellArg "${skilloptSleepPlugin}/scripts/skillopt-sleep-omp.py"} ${lib.escapeShellArgs skilloptSleepArgs}
@@ -569,6 +580,7 @@ in
                 HOME = config.user.home;
                 PATH = "/etc/profiles/per-user/${config.user.name}/bin:/run/current-system/sw/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin";
                 SKILLOPT_SLEEP_REPO = "${skilloptSleepSource}";
+                SKILLOPT_SLEEP_STAGING_ROOT = "${config.user.home}/.skillopt-sleep/omp/staging";
               };
             };
           };

packages/pi-packages/omp-skillopt-sleep/scripts/skillopt-sleep-omp.py

@@ -345,6 +345,10 @@ def main(argv: list[str] | None = None) -> int:
 
     sessions_dir = Path(known.omp_sessions).expanduser()
     mirror_home = Path(known.omp_mirror_home).expanduser()
+    os.environ.setdefault(
+        "SKILLOPT_SLEEP_STAGING_ROOT",
+        str(Path.home() / ".skillopt-sleep" / "omp" / "staging"),
+    )
     if not sessions_dir.is_dir():
         print(f"[skillopt-omp] ERROR: OMP sessions dir not found: {sessions_dir}", file=sys.stderr)
         return 1

packages/pi-packages/omp-skillopt-sleep/skills/skillopt-sleep/SKILL.md

@@ -28,8 +28,8 @@ runs `python -m skillopt_sleep` with `--source claude --claude-home <mirror>`.
 
 - Source sessions: `~/.omp/agent/sessions/**/*.jsonl`
 - Mirror state: `~/.skillopt-sleep/omp/claude-home`
-- SkillOpt state/staging: managed by SkillOpt-Sleep, normally under
-  `~/.skillopt-sleep/`
+- SkillOpt state/staging: `~/.skillopt-sleep/omp/.skillopt-sleep/state.json`
+  and `~/.skillopt-sleep/omp/staging/`
 - Live changes: none until `adopt`; every adoption is backed up by the engine
 
 Tool outputs are not mirrored. The wrapper keeps user/assistant text and