pika-cloud-incus-lifecycle-helper

Evidence

@@ -0,0 +1,204 @@
+#!@python3@
+import argparse
+import fcntl
+import json
+import os
+import pathlib
+import tempfile
+from datetime import datetime
+
+
+LIFECYCLE_SCHEMA_VERSION = 1

@@ +76,0 +76,16 @@
+def write_status(
+    status_path: pathlib.Path,
+    state: str,
+    message: str,
+    details,
+) -> None:
+    payload = {
+        "schema_version": LIFECYCLE_SCHEMA_VERSION,
+        "state": state,
+        "updated_at": finished_at(),
+        "message": message,
+    }

@@ +100,0 +100,30 @@
+def append_event(
+    events_path: pathlib.Path,
+    seq_path: pathlib.Path,
+    kind: str,
+    message: str,
+    details,
+) -> None:
+    ...
+    with seq_path.open("a+", encoding="utf-8") as seq_file:
+        fcntl.flock(seq_file.fileno(), fcntl.LOCK_EX)

@@ +148,0 +148,12 @@
+def write_result(
+    result_path: pathlib.Path,
+    status: str,
+    exit_code: int,
+    message: str,
+    details,
+) -> None:

Evidence

@@ -0,0 +1,8 @@
+{ pkgs }:
+
+pkgs.writeScriptBin "pika-cloud-lifecycle" (
+  builtins.replaceStrings
+    [ "@python3@" ]
+    [ "${pkgs.python3}/bin/python3" ]
+    (builtins.readFile ./pika-cloud-lifecycle.py.in)
+)

Evidence

@@ -1,6 +1,7 @@
 { lib, pkgs, modulesPath, pikachatPkg, openclawGatewayPkg, ... }:
 
 let
+  pikaCloudLifecycle = import ./pika-cloud-lifecycle-helper.nix { inherit pkgs; };

@@ -64,6 +65,7 @@
     python3
     pikachatPkg
     openclawGatewayPkg
+    pikaCloudLifecycle

@@ -1,6 +1,7 @@
 { lib, pkgs, modulesPath, ... }:
 
 let
+  pikaCloudLifecycle = import ./pika-cloud-lifecycle-helper.nix { inherit pkgs; };

@@ -351,6 +366,7 @@
     postgresql
     procps
     python3
+    pikaCloudLifecycle

Evidence

@@ -126,8 +126,7 @@
 set -euo pipefail
 
 STARTUP_PLAN_PATH="/{startup_plan_path}"
-LIFECYCLE_SCHEMA_VERSION={lifecycle_schema_version}
-event_seq=0
+LIFECYCLE_HELPER="/run/current-system/sw/bin/pika-cloud-lifecycle"

@@ -212,60 +194,32 @@
-  payload="$(
-    jq -nc \
-      --argjson schema_version "$LIFECYCLE_SCHEMA_VERSION" \
-      --arg state "$state" \
+  local -a args=(
+    status
+    --status-path "$(runtime_status_path)"
+    --state "$state"
+    --message "$message"
+  )
+  if [[ "$details_json" != "null" ]]; then
+    args+=(--details-json "$details_json")
+  fi
+  "$LIFECYCLE_HELPER" "${args[@]}"

@@ -155,12 +155,6 @@
-current_boot_id() {{
-  if [[ -r /proc/sys/kernel/random/boot_id ]]; then
-    tr -d '\n' < /proc/sys/kernel/random/boot_id
-  fi
-}}
-

@@ -174,17 +167,6 @@
-write_json_atomically() {{
-  local path="$1"
-  local payload="$2"
-  local dir
-  dir="$(dirname "$path")"
-  mkdir -p "$dir"
-  local tmp="$dir/.tmp.$(basename "$path").$$"
-  printf '%s\n' "$payload" > "$tmp"
-  mv "$tmp" "$path"
-}}

Evidence

@@ -14,61 +15,8 @@
     PIKACI_UID = 1000
     USERS_GID = 100
     SYSTEM_BIN = "/run/current-system/sw/bin"
+    LIFECYCLE_HELPER = "/run/current-system/sw/bin/pika-cloud-lifecycle"
     INCUS_GUEST_RUN_REQUEST_SCHEMA_VERSION = 2
-    LIFECYCLE_SCHEMA_VERSION = 1
-    EVENT_SEQ = 0

@@ -114,6 +62,73 @@
+    def run_lifecycle_helper(*args) -> None:
+        subprocess.run([LIFECYCLE_HELPER, *args], check=True)
+
+
+    def write_status(
+        status_path: pathlib.Path,
+        state: str,
+        message: str,
+        details_json: str | None = None,
+    ) -> None:

@@ -132,7 +147,9 @@
+    status_path = state_dir / "status.json"
     events_path = state_dir / "events.jsonl"
+    result_path = state_dir / "result.json"

@@ -204,18 +221,16 @@
             write_status(
-                state_dir,
+                status_path,
                 "starting",
                 "launching guest command",
-                command=command,
-                run_as_root=run_as_root,
+                json.dumps({"command": command, "run_as_root": run_as_root}),

Evidence

@@ -2477,6 +2477,10 @@
+    fn incus_lifecycle_helper_source() -> &'static str {
+        include_str!("../../../nix/incus/pika-cloud-lifecycle.py.in")
+    }

@@ -2579,51 +2583,99 @@
     #[test]
-    fn remote_linux_incus_image_pins_shared_status_and_event_contract() {
-        let source = incus_guest_image_source();
+    fn remote_linux_incus_lifecycle_helper_pins_shared_status_and_event_contract() {
+        let source = incus_lifecycle_helper_source();

@@ -2583,99 +2583,99 @@
+                "LIFECYCLE_SCHEMA_VERSION = 1",
+                "def write_status(",
                 "\"schema_version\": LIFECYCLE_SCHEMA_VERSION",
+                "payload[\"boot_id\"] = boot_id",
+                "def default_seq_path(events_path: pathlib.Path) -> pathlib.Path:",
+                "fcntl.flock(seq_file.fileno(), fcntl.LOCK_EX)",

@@ -787,10 +730,12 @@
+                "LIFECYCLE_HELPER=\"/run/current-system/sw/bin/pika-cloud-lifecycle\"",
+                "\"$LIFECYCLE_HELPER\" \"${args[@]}\"",
+                "--status-path \"$(runtime_status_path)\"",

@@ +810,3 +754,3 @@
+        assert!(!script.contains("event_seq="));
+        assert!(!script.contains("write_json_atomically"));
+        assert!(!script.contains("current_boot_id"));

Evidence

@@ -21,8 +21,10 @@
+  - Capture abstraction opportunities too, especially when you deliberately choose a smaller tactical seam over a larger redesign.
   - Do not widen the active chunk just because the journal grew.
   - Triage the journal at the end of the broader project or migration once the primary seams are landed.
+  - Before declaring the broader project done, review the journal and explicitly decide what to land now vs leave for later.