fix: satisfy restart sentinel architecture gates

steipete · steipete · commit c7714f4a9107 · 2026-07-17T06:44:27.000-07:00
diff --git a/src/infra/restart-sentinel-store.ts b/src/infra/restart-sentinel-store.ts
@@ -7,21 +7,21 @@ import {
   getNodeSqliteKysely,
 } from "./kysely-sync.js";
 
-export type RestartSentinelLog = {
+type RestartSentinelLog = {
   stdoutTail?: string | null;
   stderrTail?: string | null;
   exitCode?: number | null;
 };
 
-export type RestartSentinelStep = {
+type RestartSentinelStep = {
   name: string;
   command: string;
   cwd?: string | null;
   durationMs?: number | null;
   log?: RestartSentinelLog | null;
 };
 
-export type RestartSentinelStats = {
+type RestartSentinelStats = {
   mode?: string;
   root?: string;
   requiresRestart?: boolean;
@@ -70,7 +70,7 @@ export type RestartSentinel = RestartSentinelEnvelope & {
   revision: number;
 };
 
-export type RestartSentinelRowState =
+type RestartSentinelRowState =
   | { kind: "missing" }
   | { kind: "invalid"; revision: number }
   | { kind: "valid"; sentinel: RestartSentinel };
@@ -242,7 +242,7 @@ function parseRestartSentinelContinuation(value: unknown): RestartSentinelContin
   return null;
 }
 
-export function parseRestartSentinelPayload(value: unknown): RestartSentinelPayload | null {
+function parseRestartSentinelPayload(value: unknown): RestartSentinelPayload | null {
   if (
     !isPlainRecord(value) ||
     !RESTART_SENTINEL_KINDS.has(value.kind as RestartSentinelPayload["kind"]) ||
diff --git a/src/infra/restart-sentinel.test.ts b/src/infra/restart-sentinel.test.ts
@@ -52,7 +52,6 @@ import {
   hasRestartSentinel,
   markUpdateRestartSentinelFailure,
   readRestartSentinel,
-  rewriteRestartSentinelIfRevision,
   summarizeRestartSentinel,
   trimLogTail,
   writeRestartSentinel,
@@ -310,7 +309,7 @@ describe("restart sentinel", () => {
     });
   });
 
-  it("does not let stale rewrites or deletes replace a newer sentinel", async () => {
+  it("does not let stale deletes remove a newer sentinel", async () => {
     await withRestartSentinelStateDir(async () => {
       const first = await writeRestartSentinel({
         kind: "restart",
@@ -325,12 +324,6 @@ describe("restart sentinel", () => {
         message: "new",
       });
 
-      await expect(
-        rewriteRestartSentinelIfRevision(first.revision, (payload) => ({
-          ...payload,
-          message: "stale rewrite",
-        })),
-      ).resolves.toBeNull();
       await expect(clearRestartSentinelIfRevision(first.revision)).resolves.toBe(false);
       await expect(readRestartSentinel()).resolves.toEqual(newer);
     });
diff --git a/src/infra/restart-sentinel.ts b/src/infra/restart-sentinel.ts
@@ -20,12 +20,8 @@ import {
 } from "./restart-sentinel-store.js";
 
 export type {
-  RestartSentinel,
   RestartSentinelContinuation,
-  RestartSentinelEnvelope,
   RestartSentinelPayload,
-  RestartSentinelStats,
-  RestartSentinelStep,
 } from "./restart-sentinel-store.js";
 
 const sentinelLog = createSubsystemLogger("restart-sentinel");
@@ -54,27 +50,6 @@ function cloneRestartSentinelPayload(payload: RestartSentinelPayload): RestartSe
   return structuredClone(payload);
 }
 
-export async function rewriteRestartSentinelIfRevision(
-  expectedRevision: number,
-  rewrite: (payload: RestartSentinelPayload) => RestartSentinelPayload | null,
-  env: NodeJS.ProcessEnv = process.env,
-): Promise<RestartSentinel | null> {
-  return runOpenClawStateWriteTransaction(
-    ({ db }) => {
-      const current = readRestartSentinelRowSync(db);
-      if (current.kind !== "valid" || current.sentinel.revision !== expectedRevision) {
-        return null;
-      }
-      const nextPayload = rewrite(cloneRestartSentinelPayload(current.sentinel.payload));
-      return nextPayload
-        ? writeRestartSentinelRowIfRevisionSync(db, nextPayload, expectedRevision)
-        : null;
-    },
-    { env },
-    { operationLabel: "restart-sentinel.rewrite" },
-  );
-}
-
 async function rewriteRestartSentinel(
   rewrite: (payload: RestartSentinelPayload) => RestartSentinelPayload | null,
   env: NodeJS.ProcessEnv = process.env,
diff --git a/src/infra/state-migrations.restart-sentinel.ts b/src/infra/state-migrations.restart-sentinel.ts
@@ -22,6 +22,7 @@ import {
   writeRestartSentinelRowSync,
   type RestartSentinelEnvelope,
 } from "./restart-sentinel-store.js";
+import type { LegacyRestartSentinelDetection } from "./state-migrations.restart-sentinel.types.js";
 import type { MigrationMessages } from "./state-migrations.types.js";
 
 const LEGACY_RESTART_SENTINEL_FILENAME = "restart-sentinel.json";
@@ -37,11 +38,6 @@ type RestartSentinelMigrationDatabase = Pick<
   "gateway_restart_sentinel" | "migration_runs" | "migration_sources"
 >;
 
-export type LegacyRestartSentinelDetection = {
-  sourcePath: string;
-  hasLegacy: boolean;
-};
-
 type LegacySourceSnapshot = {
   buffer: Buffer;
   dev: number;
diff --git a/src/infra/state-migrations.restart-sentinel.types.ts b/src/infra/state-migrations.restart-sentinel.types.ts
@@ -0,0 +1,4 @@
+export type LegacyRestartSentinelDetection = {
+  sourcePath: string;
+  hasLegacy: boolean;
+};
diff --git a/src/infra/state-migrations.types.ts b/src/infra/state-migrations.types.ts
@@ -3,7 +3,7 @@ import type { SessionScope } from "../config/sessions/types.js";
 import type { PluginDoctorStateMigration } from "../plugins/doctor-contract-registry.js";
 import type { LegacyChannelPairingStateDetection } from "./state-migrations.channel-pairing.js";
 import type { LegacyMcpOAuthDetection } from "./state-migrations.mcp-oauth.types.js";
-import type { LegacyRestartSentinelDetection } from "./state-migrations.restart-sentinel.js";
+import type { LegacyRestartSentinelDetection } from "./state-migrations.restart-sentinel.types.js";
 import type { LegacyWorkspaceStateDetection } from "./state-migrations.workspace-setup.types.js";
 
 export type LegacyRescuePendingDetection = {
