@pi-ohm/painter 0.6.4-dev.25351601005.1.815a0e8 → 0.6.4-dev.25620170147.1.0b6891f

package/dist/config.d.ts

@@ -0,0 +1,75 @@
+import * as _$_pi_ohm_core_config0 from "@pi-ohm/core/config";
+import { Type } from "typebox";
+
+//#region src/config.d.ts
+interface PainterConfig {
+  enabled: boolean;
+  googleNanoBanana: {
+    enabled: boolean;
+    model: string;
+  };
+  openai: {
+    enabled: boolean;
+    model: string;
+  };
+  azureOpenai: {
+    enabled: boolean;
+    deployment: string;
+    endpoint: string;
+    apiVersion: string;
+  };
+}
+declare const DEFAULT_PAINTER_CONFIG: PainterConfig;
+declare const PainterConfigSchema: Type.TObject<{
+  enabled: Type.TOptional<Type.TBoolean>;
+  googleNanoBanana: Type.TOptional<Type.TObject<{
+    enabled: Type.TOptional<Type.TBoolean>;
+    model: Type.TOptional<Type.TString>;
+  }>>;
+  openai: Type.TOptional<Type.TObject<{
+    enabled: Type.TOptional<Type.TBoolean>;
+    model: Type.TOptional<Type.TString>;
+  }>>;
+  azureOpenai: Type.TOptional<Type.TObject<{
+    enabled: Type.TOptional<Type.TBoolean>;
+    deployment: Type.TOptional<Type.TString>;
+    endpoint: Type.TOptional<Type.TString>;
+    apiVersion: Type.TOptional<Type.TString>;
+  }>>;
+}>;
+declare const painterConfigModule: _$_pi_ohm_core_config0.ExtensionConfigModule<{
+  enabled: boolean;
+  googleNanoBanana: {
+    enabled: boolean;
+    model: string;
+  };
+  openai: {
+    enabled: boolean;
+    model: string;
+  };
+  azureOpenai: {
+    enabled: boolean;
+    deployment: string;
+    endpoint: string;
+    apiVersion: string;
+  };
+}, Type.TObject<{
+  enabled: Type.TOptional<Type.TBoolean>;
+  googleNanoBanana: Type.TOptional<Type.TObject<{
+    enabled: Type.TOptional<Type.TBoolean>;
+    model: Type.TOptional<Type.TString>;
+  }>>;
+  openai: Type.TOptional<Type.TObject<{
+    enabled: Type.TOptional<Type.TBoolean>;
+    model: Type.TOptional<Type.TString>;
+  }>>;
+  azureOpenai: Type.TOptional<Type.TObject<{
+    enabled: Type.TOptional<Type.TBoolean>;
+    deployment: Type.TOptional<Type.TString>;
+    endpoint: Type.TOptional<Type.TString>;
+    apiVersion: Type.TOptional<Type.TString>;
+  }>>;
+}>>;
+declare function isPainterConfig(value: unknown): value is PainterConfig;
+//#endregion
+export { DEFAULT_PAINTER_CONFIG, PainterConfig, PainterConfigSchema, isPainterConfig, painterConfigModule };

package/dist/config.js

@@ -0,0 +1,75 @@
+import { Result } from "better-result";
+import { registerConfig } from "@pi-ohm/core/config";
+import { Type } from "typebox";
+
+//#region src/config.ts
+const DEFAULT_PAINTER_CONFIG = {
+	enabled: true,
+	googleNanoBanana: {
+		enabled: true,
+		model: "gemini-2.5-flash-image-preview"
+	},
+	openai: {
+		enabled: true,
+		model: "gpt-image-1"
+	},
+	azureOpenai: {
+		enabled: false,
+		deployment: "",
+		endpoint: "",
+		apiVersion: "2025-04-01-preview"
+	}
+};
+const ProviderConfigSchema = Type.Object({
+	enabled: Type.Optional(Type.Boolean()),
+	model: Type.Optional(Type.String())
+}, { additionalProperties: false });
+const AzureOpenAiConfigSchema = Type.Object({
+	enabled: Type.Optional(Type.Boolean()),
+	deployment: Type.Optional(Type.String()),
+	endpoint: Type.Optional(Type.String()),
+	apiVersion: Type.Optional(Type.String())
+}, { additionalProperties: false });
+const PainterConfigSchema = Type.Object({
+	enabled: Type.Optional(Type.Boolean()),
+	googleNanoBanana: Type.Optional(ProviderConfigSchema),
+	openai: Type.Optional(ProviderConfigSchema),
+	azureOpenai: Type.Optional(AzureOpenAiConfigSchema)
+}, { additionalProperties: false });
+function mergeProvider(base, patch) {
+	return {
+		enabled: patch?.enabled ?? base.enabled,
+		model: patch?.model ?? base.model
+	};
+}
+const painterConfigModule = registerConfig({
+	namespace: "painter",
+	schema: PainterConfigSchema,
+	defaults: DEFAULT_PAINTER_CONFIG,
+	merge(base, patch) {
+		return Result.ok({
+			enabled: patch.enabled ?? base.enabled,
+			googleNanoBanana: mergeProvider(base.googleNanoBanana, patch.googleNanoBanana),
+			openai: mergeProvider(base.openai, patch.openai),
+			azureOpenai: {
+				enabled: patch.azureOpenai?.enabled ?? base.azureOpenai.enabled,
+				deployment: patch.azureOpenai?.deployment ?? base.azureOpenai.deployment,
+				endpoint: patch.azureOpenai?.endpoint ?? base.azureOpenai.endpoint,
+				apiVersion: patch.azureOpenai?.apiVersion ?? base.azureOpenai.apiVersion
+			}
+		});
+	}
+});
+function isProviderConfig(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	return typeof Reflect.get(value, "enabled") === "boolean" && typeof Reflect.get(value, "model") === "string";
+}
+function isPainterConfig(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const azure = Reflect.get(value, "azureOpenai");
+	if (typeof azure !== "object" || azure === null || Array.isArray(azure)) return false;
+	return typeof Reflect.get(value, "enabled") === "boolean" && isProviderConfig(Reflect.get(value, "googleNanoBanana")) && isProviderConfig(Reflect.get(value, "openai")) && typeof Reflect.get(azure, "enabled") === "boolean" && typeof Reflect.get(azure, "deployment") === "string" && typeof Reflect.get(azure, "endpoint") === "string" && typeof Reflect.get(azure, "apiVersion") === "string";
+}
+
+//#endregion
+export { DEFAULT_PAINTER_CONFIG, PainterConfigSchema, isPainterConfig, painterConfigModule };

package/dist/extension.d.ts

@@ -1,4 +1,4 @@
-import { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 //#region src/extension.d.ts
 declare function registerPainterExtension(pi: ExtensionAPI): void;

package/dist/extension.js

@@ -1,36 +1,59 @@
-import { loadOhmRuntimeConfig, registerOhmSettings } from "@pi-ohm/config";
+import { isPainterConfig, painterConfigModule } from "./config.js";
+import { Result } from "better-result";
+import { loadConfig, pickConfig } from "@pi-ohm/core/config";
 
 //#region src/extension.ts
+async function loadPainterConfig(cwd) {
+	const loaded = await loadConfig({
+		cwd,
+		modules: [painterConfigModule]
+	});
+	if (Result.isError(loaded)) return Result.err(loaded.error);
+	const painter = pickConfig({
+		loaded: loaded.value,
+		module: painterConfigModule,
+		is: isPainterConfig
+	});
+	if (Result.isError(painter)) return Result.err(painter.error);
+	return Result.ok({
+		loaded: loaded.value,
+		painter: painter.value
+	});
+}
 function registerPainterExtension(pi) {
-	registerOhmSettings(pi);
 	pi.on("session_start", async (_event, ctx) => {
-		const { config } = await loadOhmRuntimeConfig(ctx.cwd);
+		const config = await loadPainterConfig(ctx.cwd);
+		if (Result.isError(config)) return;
 		if (!ctx.hasUI) return;
-		if (!config.features.painterImagegen) {
+		if (!config.value.painter.enabled) {
 			ctx.ui.setStatus("ohm-painter", "painter:off");
 			return;
 		}
 		const providers = [
-			config.painter.googleNanoBanana.enabled ? "google" : null,
-			config.painter.openai.enabled ? "openai" : null,
-			config.painter.azureOpenai.enabled ? "azure" : null
+			config.value.painter.googleNanoBanana.enabled ? "google" : null,
+			config.value.painter.openai.enabled ? "openai" : null,
+			config.value.painter.azureOpenai.enabled ? "azure" : null
 		].filter(Boolean);
 		ctx.ui.setStatus("ohm-painter", `painter:on · providers:${providers.length > 0 ? providers.join("+") : "none"}`);
 	});
 	pi.registerCommand("ohm-painter", {
 		description: "Show painter provider configuration",
 		handler: async (_args, ctx) => {
-			const { config } = await loadOhmRuntimeConfig(ctx.cwd);
+			const config = await loadPainterConfig(ctx.cwd);
+			if (Result.isError(config)) {
+				console.log(config.error.message);
+				return;
+			}
 			const text = [
 				"Pi OHM: painter/imagegen",
 				"",
-				`featureEnabled: ${config.features.painterImagegen ? "yes" : "no"}`,
-				`googleNanoBanana: ${config.painter.googleNanoBanana.enabled ? "on" : "off"} (${config.painter.googleNanoBanana.model})`,
-				`openai: ${config.painter.openai.enabled ? "on" : "off"} (${config.painter.openai.model})`,
-				`azureOpenAI: ${config.painter.azureOpenai.enabled ? "on" : "off"}`,
-				`azureDeployment: ${config.painter.azureOpenai.deployment || "<unset>"}`,
-				`azureEndpoint: ${config.painter.azureOpenai.endpoint || "<unset>"}`,
-				`azureApiVersion: ${config.painter.azureOpenai.apiVersion}`
+				`enabled: ${config.value.painter.enabled ? "yes" : "no"}`,
+				`googleNanoBanana: ${config.value.painter.googleNanoBanana.enabled ? "on" : "off"} (${config.value.painter.googleNanoBanana.model})`,
+				`openai: ${config.value.painter.openai.enabled ? "on" : "off"} (${config.value.painter.openai.model})`,
+				`azureOpenAI: ${config.value.painter.azureOpenai.enabled ? "on" : "off"}`,
+				`azureDeployment: ${config.value.painter.azureOpenai.deployment || "<unset>"}`,
+				`azureEndpoint: ${config.value.painter.azureOpenai.endpoint || "<unset>"}`,
+				`azureApiVersion: ${config.value.painter.azureOpenai.apiVersion}`
 			].join("\n");
 			if (!ctx.hasUI) {
 				console.log(text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-ohm/painter",
-  "version": "0.6.4-dev.25351601005.1.815a0e8",
+  "version": "0.6.4-dev.25620170147.1.0b6891f",
   "homepage": "https://github.com/pi-ohm/pi-ohm/tree/dev/packages/painter#readme",
   "repository": {
     "type": "git",
@@ -18,6 +18,10 @@
     ".": {
       "types": "./dist/extension.d.ts",
       "default": "./dist/extension.js"
+    },
+    "./config": {
+      "types": "./dist/config.d.ts",
+      "default": "./dist/config.js"
     }
   },
   "publishConfig": {
@@ -25,15 +29,17 @@
     "provenance": true
   },
   "scripts": {
-    "build": "vp pack src/extension.ts"
+    "build": "vp pack src/extension.ts src/config.ts"
   },
   "dependencies": {
-    "@mariozechner/pi-coding-agent": "^0.72.1",
-    "@mariozechner/pi-tui": "^0.72.1",
-    "@pi-ohm/config": "0.6.4-dev.25351601005.1.815a0e8"
+    "@earendil-works/pi-coding-agent": "0.74.0",
+    "@earendil-works/pi-tui": "0.74.0",
+    "@pi-ohm/core": "0.6.4-dev.25620170147.1.0b6891f",
+    "better-result": "2.9.2",
+    "typebox": "^1.0.68"
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*"
+    "@earendil-works/pi-coding-agent": "0.74.0"
   },
   "pi": {
     "extensions": [