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

package/dist/config.d.ts

@@ -0,0 +1,20 @@
+import * as _$_pi_ohm_core_config0 from "@pi-ohm/core/config";
+import { Type } from "typebox";
+
+//#region src/config.d.ts
+type Mode = "rush" | "smart" | "deep";
+interface ModesConfig {
+  defaultMode: Mode;
+}
+declare const DEFAULT_MODES_CONFIG: ModesConfig;
+declare const ModesConfigSchema: Type.TObject<{
+  defaultMode: Type.TOptional<Type.TUnion<[Type.TLiteral<"rush">, Type.TLiteral<"smart">, Type.TLiteral<"deep">]>>;
+}>;
+declare const modesConfigModule: _$_pi_ohm_core_config0.ExtensionConfigModule<{
+  defaultMode: Mode;
+}, Type.TObject<{
+  defaultMode: Type.TOptional<Type.TUnion<[Type.TLiteral<"rush">, Type.TLiteral<"smart">, Type.TLiteral<"deep">]>>;
+}>>;
+declare function isModesConfig(value: unknown): value is ModesConfig;
+//#endregion
+export { DEFAULT_MODES_CONFIG, Mode, ModesConfig, ModesConfigSchema, isModesConfig, modesConfigModule };

package/dist/config.js

@@ -0,0 +1,27 @@
+import { Result } from "better-result";
+import { registerConfig } from "@pi-ohm/core/config";
+import { Type } from "typebox";
+
+//#region src/config.ts
+const DEFAULT_MODES_CONFIG = { defaultMode: "smart" };
+const ModesConfigSchema = Type.Object({ defaultMode: Type.Optional(Type.Union([
+	Type.Literal("rush"),
+	Type.Literal("smart"),
+	Type.Literal("deep")
+])) }, { additionalProperties: false });
+const modesConfigModule = registerConfig({
+	namespace: "modes",
+	schema: ModesConfigSchema,
+	defaults: DEFAULT_MODES_CONFIG,
+	merge(base, patch) {
+		return Result.ok({ defaultMode: patch.defaultMode ?? base.defaultMode });
+	}
+});
+function isModesConfig(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
+	const mode = Reflect.get(value, "defaultMode");
+	return mode === "rush" || mode === "smart" || mode === "deep";
+}
+
+//#endregion
+export { DEFAULT_MODES_CONFIG, ModesConfigSchema, isModesConfig, modesConfigModule };

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 registerModesExtension(pi: ExtensionAPI): void;

package/dist/extension.js

@@ -1,6 +1,25 @@
-import { loadOhmRuntimeConfig, registerOhmSettings, setOhmSetting } from "@pi-ohm/config";
+import { isModesConfig, modesConfigModule } from "./config.js";
+import { Result } from "better-result";
+import { loadConfig, pickConfig } from "@pi-ohm/core/config";
 
 //#region src/extension.ts
+async function loadModesConfig(cwd) {
+	const loaded = await loadConfig({
+		cwd,
+		modules: [modesConfigModule]
+	});
+	if (Result.isError(loaded)) return Result.err(loaded.error);
+	const config = pickConfig({
+		loaded: loaded.value,
+		module: modesConfigModule,
+		is: isModesConfig
+	});
+	if (Result.isError(config)) return Result.err(config.error);
+	return Result.ok({
+		loaded: loaded.value,
+		config: config.value
+	});
+}
 const MODES = [
 	"rush",
 	"smart",
@@ -36,27 +55,31 @@ function parseRequestedMode(args) {
 	return null;
 }
 async function refreshModeStatus(ctx) {
-	const { config } = await loadOhmRuntimeConfig(ctx.cwd);
+	const config = await loadModesConfig(ctx.cwd);
+	if (Result.isError(config)) return;
 	if (!ctx.hasUI) return;
-	ctx.ui.setStatus("ohm-mode", `mode:${config.defaultMode}`);
+	ctx.ui.setStatus("ohm-mode", `mode:${config.value.config.defaultMode}`);
 }
 function registerModesExtension(pi) {
-	registerOhmSettings(pi);
 	pi.on("session_start", async (_event, ctx) => {
 		await refreshModeStatus(ctx);
 	});
 	pi.registerCommand("ohm-modes", {
 		description: "Show available modes and current default mode",
 		handler: async (_args, ctx) => {
-			const { config, loadedFrom } = await loadOhmRuntimeConfig(ctx.cwd);
+			const config = await loadModesConfig(ctx.cwd);
+			if (Result.isError(config)) {
+				console.log(config.error.message);
+				return;
+			}
 			const text = [
 				"Pi OHM modes",
 				"",
-				`defaultMode: ${config.defaultMode}`,
+				`defaultMode: ${config.value.config.defaultMode}`,
 				`available: ${MODES.join(", ")}`,
 				"",
 				"Set mode with: /ohm-mode <rush|smart|deep>",
-				`loadedFrom: ${loadedFrom.length > 0 ? loadedFrom.join(", ") : "defaults + extension settings"}`
+				`loadedFrom: ${config.value.loaded.loadedFrom.length > 0 ? config.value.loaded.loadedFrom.join(", ") : "defaults"}`
 			].join("\n");
 			if (!ctx.hasUI) {
 				console.log(text);
@@ -78,13 +101,12 @@ function registerModesExtension(pi) {
 				await ctx.ui.editor("pi-ohm mode usage", usage);
 				return;
 			}
-			setOhmSetting("default-mode", requestedMode);
-			await refreshModeStatus(ctx);
 			const text = [
-				"Pi OHM mode updated",
+				"Pi OHM mode",
 				"",
-				`defaultMode: ${requestedMode}`,
-				"Tip: run /ohm-config to inspect merged runtime config."
+				`requestedMode: ${requestedMode}`,
+				"Persist by setting modes.defaultMode in ohm.json.",
+				"Tip: run /ohm-config to inspect merged config."
 			].join("\n");
 			if (!ctx.hasUI) {
 				console.log(text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-ohm/modes",
-  "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/modes#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,14 +29,16 @@
     "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",
-    "@pi-ohm/config": "0.6.4-dev.25351601005.1.815a0e8"
+    "@earendil-works/pi-coding-agent": "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": [