Merge origin/master and preserve both Cloud storage fixture contracts

Co-Authored-By: Paperclip <noreply@paperclip.ing>

server/src/__tests__/managed-skill-content.test.ts

@@ -166,6 +166,35 @@ describe.skipIf(!support.supported)("managed skills use committed versions", ()
     }
   }, 180_000);
 
+  it("reports a provider mismatch for local versions under persisted Cloud configuration", async () => {
+    const companyId = await company();
+    const skill = await companySkillService(db).createLocalSkill(companyId, { name: "Cloud CLI", markdown: "# Cloud CLI" });
+    const local = await skillInstallationMaintenance(db).verifyVersions({ companyId, limit: 50 });
+    expect(local.results).toEqual([expect.objectContaining({ versionId: skill.currentVersionId, status: "local_storage" })]);
+    const key = "cloud-runtime-config:v1";
+    const run = (phase: string) => promisify(execFile)(process.execPath, [
+      "--import", fileURLToPath(import.meta.resolve("tsx")),
+      fileURLToPath(new URL("../../scripts/migrate-skill-packages.ts", import.meta.url)),
+      `--phase=${phase}`, `--company=${companyId}`, "--limit=50",
+    ], { env: { ...process.env, DATABASE_URL: database.connectionString,
+      PAPERCLIP_CLOUD_TENANT_SERVER_TOKEN: "disposable-cloud-cli-fixture",
+      PAPERCLIP_STORAGE_PROVIDER: "s3", PAPERCLIP_STORAGE_S3_BUCKET: "managed-skill-cli-fixture",
+      PAPERCLIP_STORAGE_S3_REGION: "us-east-1", PAPERCLIP_SECRETS_MASTER_KEY: "a".repeat(64) },
+      timeout: 60_000, maxBuffer: 1024 * 1024 });
+    await expect(run("eligibility")).rejects.toThrow("Initialize Cloud runtime configuration");
+    expect(await db.select().from(instanceSettings).where(eq(instanceSettings.singletonKey, key))).toHaveLength(0);
+    const [persisted] = await db.insert(instanceSettings).values({ singletonKey: key, general: { version: 1, revision: 0, config: null } }).returning();
+    try {
+      const eligibility = JSON.parse((await run("eligibility")).stdout.trim().split("\n").at(-1)!);
+      expect(eligibility.results).toEqual([expect.objectContaining({ versionId: skill.currentVersionId, status: "version_backed" })]);
+      const verification = JSON.parse((await run("verification")).stdout.trim().split("\n").at(-1)!);
+      expect(verification.results).toEqual([expect.objectContaining({ versionId: skill.currentVersionId, status: "provider_mismatch" })]);
+      expect(await db.select().from(instanceSettings).where(eq(instanceSettings.singletonKey, key))).toEqual([persisted]);
+    } finally {
+      await db.delete(instanceSettings).where(eq(instanceSettings.singletonKey, key));
+    }
+  }, 180_000);
+
   it("forks live linked-local content even when an older saved version exists", async () => {
     const companyId = await company();
     const directory = path.join(root, `linked-${randomUUID()}`);