wangxuming/makelore
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(plugins): load official hosted plugins from bundled resources

Browse Source
This commit is contained in:
brother7
2026-09-01 18:20:24 +08:00
parent 52e2a97a12
commit 1530ac7740
23 changed files with 835 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electron/coding-plugins/adapters/game-resource.ts
View File

@@ -5,6 +5,7 @@ import type { CodingPluginToolDefinition } from '../../../shared/coding-plugins'
import { PiGameAssetTools } from '../../coding-runtime/pi/extensions/game-assets';
import type { MarketplacePackageClientPort, PluginPackageStore } from '../package-store';
import {
type BundledHostedRelease,
MarketplaceHostedAdmissionError,
MarketplaceHostedAdmissionResolver,
} from '../hosted-admission';
@@ -32,6 +33,7 @@ export interface GameResourcePluginAdapterOptions {
readonly marketplace: MarketplacePackageClientPort;
readonly packageStore: Pick<PluginPackageStore, 'getInstalled' | 'getInstalledRelease'>;
readonly makeloreVersion: string;
readonly bundledReleases?: Readonly<Record<string, BundledHostedRelease>>;
readonly admissionResolver?: MarketplaceHostedAdmissionResolver;
readonly gameAssets?: PiGameAssetTools;
}
@@ -175,10 +177,12 @@ export class GameResourcePluginAdapter implements CodingPluginAdapter {
marketplace: options.marketplace,
packageStore: options.packageStore,
makeloreVersion: options.makeloreVersion,
bundledReleases: options.bundledReleases,
});
}
async inspect(): Promise<PluginBackendProjection> {
if (this.options.bundledReleases?.[PLUGIN_ID]) return { status: 'ready' };
const installed = await this.options.packageStore.getInstalled(PLUGIN_ID).catch(() => null);
return installed ? { status: 'ready' } : { status: 'unconfigured' };
}

4
electron/coding-plugins/adapters/web-search.ts
View File

@@ -1,6 +1,7 @@
import type { CodingPluginToolDefinition } from '../../../shared/coding-plugins';
import type { CapabilityBillingReceiptV1 } from '../../../shared/data-service';
import {
type BundledHostedRelease,
MarketplaceHostedAdmissionError,
MarketplaceHostedAdmissionResolver,
} from '../hosted-admission';
@@ -62,6 +63,7 @@ export interface WebSearchPluginAdapterOptions {
readonly marketplace?: MarketplacePackageClientPort;
readonly packageStore?: Pick<PluginPackageStore, 'getInstalled' | 'getInstalledRelease'>;
readonly makeloreVersion?: string;
readonly bundledReleases?: Readonly<Record<string, BundledHostedRelease>>;
readonly admissionResolver?: MarketplaceHostedAdmissionResolver;
}
@@ -230,6 +232,7 @@ export class WebSearchPluginAdapter implements CodingPluginAdapter {
marketplace: options.marketplace,
packageStore: options.packageStore,
makeloreVersion: options.makeloreVersion,
bundledReleases: options.bundledReleases,
});
} else {
throw new TypeError('Web Search adapter requires Marketplace admission dependencies');
@@ -237,6 +240,7 @@ export class WebSearchPluginAdapter implements CodingPluginAdapter {
}
async inspect(_projectPath: string): Promise<PluginBackendProjection> {
if (this.options.bundledReleases?.[PLUGIN_ID]) return { status: 'ready' };
const installed = await this.options.packageStore?.getInstalled(PLUGIN_ID).catch(() => null);
return installed ? { status: 'ready' } : { status: 'unconfigured' };
}