fix(secrets): harden sops migration sops rule matching

src/process/exec.ts

@@ -46,7 +46,7 @@ export function shouldSpawnWithShell(params: {
 export async function runExec(
   command: string,
   args: string[],
-  opts: number | { timeoutMs?: number; maxBuffer?: number } = 10_000,
+  opts: number | { timeoutMs?: number; maxBuffer?: number; cwd?: string } = 10_000,
 ): Promise<{ stdout: string; stderr: string }> {
   const options =
     typeof opts === "number"
@@ -54,6 +54,7 @@ export async function runExec(
       : {
           timeout: opts.timeoutMs,
           maxBuffer: opts.maxBuffer,
+          cwd: opts.cwd,
           encoding: "utf8" as const,
         };
   try {

src/secrets/migrate.test.ts

@@ -228,5 +228,31 @@ describe("secrets migrate", () => {
     const configIndex = args.indexOf("--config");
     expect(configIndex).toBeGreaterThanOrEqual(0);
     expect(args[configIndex + 1]).toBe(sopsConfigPath);
+    const filenameOverrideIndex = args.indexOf("--filename-override");
+    expect(filenameOverrideIndex).toBeGreaterThanOrEqual(0);
+    expect(args[filenameOverrideIndex + 1]).toBe(
+      path.join(stateDir, "secrets.enc.json").replaceAll(path.sep, "/"),
+    );
+    const options = encryptCall?.[2] as { cwd?: string } | undefined;
+    expect(options?.cwd).toBe(stateDir);
+  });
+
+  it("passes a stable filename override for sops when config file is absent", async () => {
+    await runSecretsMigration({ env, write: true });
+
+    const encryptCall = runExecMock.mock.calls.find((call) =>
+      (call[1] as string[]).includes("--encrypt"),
+    );
+    expect(encryptCall).toBeTruthy();
+    const args = encryptCall?.[1] as string[];
+    const configIndex = args.indexOf("--config");
+    expect(configIndex).toBe(-1);
+    const filenameOverrideIndex = args.indexOf("--filename-override");
+    expect(filenameOverrideIndex).toBeGreaterThanOrEqual(0);
+    expect(args[filenameOverrideIndex + 1]).toBe(
+      path.join(stateDir, "secrets.enc.json").replaceAll(path.sep, "/"),
+    );
+    const options = encryptCall?.[2] as { cwd?: string } | undefined;
+    expect(options?.cwd).toBe(stateDir);
   });
 });

src/secrets/sops.ts

@@ -7,6 +7,21 @@ import { ensureDirForFile, normalizePositiveInt } from "./shared.js";
 export const DEFAULT_SOPS_TIMEOUT_MS = 5_000;
 const MAX_SOPS_OUTPUT_BYTES = 10 * 1024 * 1024;
 
+function toSopsPath(value: string): string {
+  return value.replaceAll(path.sep, "/");
+}
+
+function resolveFilenameOverride(params: { targetPath: string }): string {
+  return toSopsPath(path.resolve(params.targetPath));
+}
+
+function resolveSopsCwd(params: { targetPath: string; configPath?: string }): string {
+  if (typeof params.configPath === "string" && params.configPath.trim().length > 0) {
+    return path.dirname(params.configPath);
+  }
+  return path.dirname(params.targetPath);
+}
+
 function normalizeTimeoutMs(value: number | undefined): number {
   return normalizePositiveInt(value, DEFAULT_SOPS_TIMEOUT_MS);
 }
@@ -37,6 +52,10 @@ export async function decryptSopsJsonFile(params: {
   configPath?: string;
 }): Promise<unknown> {
   const timeoutMs = normalizeTimeoutMs(params.timeoutMs);
+  const cwd = resolveSopsCwd({
+    targetPath: params.path,
+    configPath: params.configPath,
+  });
   try {
     const args: string[] = [];
     if (typeof params.configPath === "string" && params.configPath.trim().length > 0) {
@@ -46,6 +65,7 @@ export async function decryptSopsJsonFile(params: {
     const { stdout } = await runExec("sops", args, {
       timeoutMs,
       maxBuffer: MAX_SOPS_OUTPUT_BYTES,
+      cwd,
     });
     return JSON.parse(stdout) as unknown;
   } catch (err) {
@@ -84,12 +104,21 @@ export async function encryptSopsJsonFile(params: {
   fs.chmodSync(tmpPlain, 0o600);
 
   try {
+    const filenameOverride = resolveFilenameOverride({
+      targetPath: params.path,
+    });
+    const cwd = resolveSopsCwd({
+      targetPath: params.path,
+      configPath: params.configPath,
+    });
     const args: string[] = [];
     if (typeof params.configPath === "string" && params.configPath.trim().length > 0) {
       args.push("--config", params.configPath);
     }
     args.push(
       "--encrypt",
+      "--filename-override",
+      filenameOverride,
       "--input-type",
       "json",
       "--output-type",
@@ -101,6 +130,7 @@ export async function encryptSopsJsonFile(params: {
     await runExec("sops", args, {
       timeoutMs,
       maxBuffer: MAX_SOPS_OUTPUT_BYTES,
+      cwd,
     });
     fs.renameSync(tmpEncrypted, params.path);
     fs.chmodSync(params.path, 0o600);