Merge pull request #782 from objectstack-ai/copilot/fix-ci-errors-again

Author: hotlong

packages/spec/src/api/package-api.zod.ts

@@ -4,7 +4,7 @@ import { z } from 'zod';
 import { BaseResponseSchema } from './contract.zod';
 import { InstalledPackageSchema } from '../kernel/package-registry.zod';
 import { DependencyResolutionResultSchema } from '../kernel/dependency-resolution.zod';
-import { UpgradePlanSchema, UpgradePackageResponseSchema, RollbackPackageResponseSchema } from '../kernel/package-upgrade.zod';
+import { UpgradePlanSchema } from '../kernel/package-upgrade.zod';
 import { PackageArtifactSchema } from '../kernel/package-artifact.zod';
 import { ManifestSchema } from '../kernel/manifest.zod';
 import { ArtifactReferenceSchema } from '../cloud/marketplace.zod';

packages/spec/src/contracts/package-service.ts

@@ -28,7 +28,7 @@ import type {
   RollbackPackageResponse,
 } from '../kernel/package-upgrade.zod';
 import type { PackageArtifact } from '../kernel/package-artifact.zod';
-import type { Manifest } from '../kernel/manifest.zod';
+import type { ObjectStackManifest } from '../kernel/manifest.zod';
 
 // ==========================================
 // Install Types
@@ -39,7 +39,7 @@ import type { Manifest } from '../kernel/manifest.zod';
  */
 export interface InstallPackageInput {
   /** The package manifest to install */
-  manifest: Manifest;
+  manifest: ObjectStackManifest;
   /** User-provided settings at install time */
   settings?: Record<string, unknown>;
   /** Whether to enable immediately after install (default: true) */
@@ -71,7 +71,7 @@ export interface InstallPackageResult {
  */
 export interface ResolveDependenciesInput {
   /** The package manifest whose dependencies to resolve */
-  manifest: Manifest;
+  manifest: ObjectStackManifest;
   /** Current platform version for compatibility filtering */
   platformVersion?: string;
 }
@@ -113,7 +113,7 @@ export interface PlanUpgradeInput {
   /** Target version to upgrade to */
   targetVersion?: string;
   /** New manifest for the target version */
-  manifest?: Manifest;
+  manifest?: ObjectStackManifest;
 }
 
 /**
@@ -125,7 +125,7 @@ export interface ExecuteUpgradeInput {
   /** Target version */
   targetVersion?: string;
   /** New manifest */
-  manifest?: Manifest;
+  manifest?: ObjectStackManifest;
   /** Whether to create a pre-upgrade snapshot */
   createSnapshot?: boolean;
   /** Merge strategy for customizations */

packages/spec/src/kernel/plugin-versioning.test.ts

@@ -8,7 +8,7 @@ import {
   CompatibilityMatrixEntrySchema,
   PluginCompatibilityMatrixSchema,
   DependencyConflictSchema,
-  DependencyResolutionResultSchema,
+  PluginDependencyResolutionResultSchema,
   MultiVersionSupportSchema,
   PluginVersionMetadataSchema,
 } from './plugin-versioning.zod';
@@ -271,7 +271,7 @@ describe('Plugin Versioning Schemas', () => {
     });
   });
 
-  describe('DependencyResolutionResultSchema', () => {
+  describe('PluginDependencyResolutionResultSchema', () => {
     it('should validate successful resolution', () => {
       const result = {
         success: true,
@@ -293,7 +293,7 @@ describe('Plugin Versioning Schemas', () => {
           'com.acme.plugin-b': [],
         },
       };
-      const parsed = DependencyResolutionResultSchema.parse(result);
+      const parsed = PluginDependencyResolutionResultSchema.parse(result);
       expect(parsed.success).toBe(true);
       expect(parsed.resolved).toHaveLength(2);
       expect(parsed.installationOrder).toEqual(['com.acme.plugin-b', 'com.acme.plugin-a']);
@@ -315,7 +315,7 @@ describe('Plugin Versioning Schemas', () => {
         ],
         warnings: ['Plugin C is deprecated'],
       };
-      const parsed = DependencyResolutionResultSchema.parse(result);
+      const parsed = PluginDependencyResolutionResultSchema.parse(result);
       expect(parsed.success).toBe(false);
       expect(parsed.conflicts).toHaveLength(1);
     });
@@ -428,7 +428,7 @@ describe('Plugin Versioning Schemas', () => {
     });
 
     it('should handle dependency conflict resolution', () => {
-      const resolution = DependencyResolutionResultSchema.parse({
+      const resolution = PluginDependencyResolutionResultSchema.parse({
         success: false,
         conflicts: [
           {

packages/spec/src/kernel/plugin-versioning.zod.ts

@@ -296,7 +296,7 @@ export const DependencyConflictSchema = z.object({
  * Dependency Resolution Result
  * Result of dependency resolution process
  */
-export const DependencyResolutionResultSchema = z.object({
+export const PluginDependencyResolutionResultSchema = z.object({
   /**
    * Resolution successful
    */
@@ -467,6 +467,6 @@ export type DeprecationNotice = z.infer<typeof DeprecationNoticeSchema>;
 export type CompatibilityMatrixEntry = z.infer<typeof CompatibilityMatrixEntrySchema>;
 export type PluginCompatibilityMatrix = z.infer<typeof PluginCompatibilityMatrixSchema>;
 export type DependencyConflict = z.infer<typeof DependencyConflictSchema>;
-export type DependencyResolutionResult = z.infer<typeof DependencyResolutionResultSchema>;
+export type PluginDependencyResolutionResult = z.infer<typeof PluginDependencyResolutionResultSchema>;
 export type MultiVersionSupport = z.infer<typeof MultiVersionSupportSchema>;
 export type PluginVersionMetadata = z.infer<typeof PluginVersionMetadataSchema>;