@caplets/pi 0.3.0 → 0.4.0

package/README.md

@@ -40,9 +40,10 @@ By default the extension uses the local Caplets native service. To connect Pi to
 especially the password:
 
 ```sh
-export CAPLETS_REMOTE_URL="https://caplets.example.com/mcp"
-export CAPLETS_REMOTE_USER="caplets"
-export CAPLETS_REMOTE_PASSWORD="..." # or load from your shell/secret manager
+export CAPLETS_MODE="remote"
+export CAPLETS_SERVER_URL="https://caplets.example.com/caplets"
+export CAPLETS_SERVER_USER="caplets"
+export CAPLETS_SERVER_PASSWORD="..." # or load from your shell/secret manager
 ```
 
 Pi currently calls extension factories with the Pi API only, so this extension reads its remote
@@ -54,10 +55,13 @@ options are supplied:
   "packages": ["npm:@caplets/pi"],
   "caplets": {
     "mode": "remote",
-    "remote": {
-      "url": "https://caplets.example.com/mcp",
+    "server": {
+      "url": "https://caplets.example.com/caplets",
       "user": "caplets"
     },
+    "remote": {
+      "pollIntervalMs": 5000
+    },
     "statusWidget": true,
     "nerdFontIcons": true
   }
@@ -79,13 +83,17 @@ import { createCapletsPiExtension } from "@caplets/pi";
 export default createCapletsPiExtension({
   args: {
     mode: "remote",
-    remote: {
-      url: "https://caplets.example.com/mcp",
+    server: {
+      url: "https://caplets.example.com/caplets",
       user: "caplets",
     },
+    remote: {
+      pollIntervalMs: 5_000,
+    },
   },
 });
 ```
 
-Prefer environment variables for `CAPLETS_REMOTE_PASSWORD` rather than storing passwords in
+The explicit config shape is `{ mode, server: { url, user }, remote: { pollIntervalMs } }`.
+Prefer environment variables for `CAPLETS_SERVER_PASSWORD` rather than storing passwords in
 settings files or source code.

package/dist/index.js

@@ -3453,7 +3453,7 @@ function topLevelCapletsOptions(settings, writeWarning, path) {
 	]) {
 		const value = objectProperty(settings, key);
 		if (!value) continue;
-		const parsed = parsePiNativeOptions(objectProperty(value, "native") ?? objectProperty(value, "args") ?? value);
+		const parsed = parsePiNativeOptions(objectProperty(value, "native") ?? objectProperty(value, "args") ?? value, writeWarning, `${path}.${key}`);
 		if (!parsed) {
 			writeWarning(`[caplets/pi] Ignoring Pi settings args: invalid ${path}.${key} shape`);
 			return {};
@@ -3461,7 +3461,7 @@ function topLevelCapletsOptions(settings, writeWarning, path) {
 		return parsed;
 	}
 }
-function parsePiNativeOptions(value) {
+function parsePiNativeOptions(value, writeWarning, path = "settings.caplets") {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	const result = {};
 	const mode = value.mode;
@@ -3482,17 +3482,6 @@ function parsePiNativeOptions(value) {
 	const remote = objectProperty(value, "remote");
 	if (remote) {
 		const parsedRemote = {};
-		for (const key of [
-			"url",
-			"user",
-			"password"
-		]) {
-			const field = remote[key];
-			if (field !== void 0) {
-				if (typeof field !== "string") return void 0;
-				parsedRemote[key] = field;
-			}
-		}
 		const pollIntervalMs = remote.pollIntervalMs;
 		if (pollIntervalMs !== void 0) {
 			if (typeof pollIntervalMs !== "number" || !Number.isFinite(pollIntervalMs)) return void 0;
@@ -3500,8 +3489,37 @@ function parsePiNativeOptions(value) {
 		}
 		result.remote = parsedRemote;
 	}
+	const server = objectProperty(value, "server");
+	const parsedServer = parsePiServerOptions(server);
+	if (parsedServer === void 0 && server) return;
+	const legacyServer = parsePiServerOptions(remote);
+	if (legacyServer === void 0 && remote && hasLegacyRemoteServerFields(remote)) return;
+	if (legacyServer && !parsedServer) writeWarning?.(`[caplets/pi] ${path}.remote.url is deprecated; move remote.url/user/password to server.url/user/password.`);
+	if (legacyServer || parsedServer) result.server = {
+		...legacyServer,
+		...parsedServer
+	};
 	return result;
 }
+function parsePiServerOptions(value) {
+	if (!value) return;
+	const parsedServer = {};
+	for (const key of [
+		"url",
+		"user",
+		"password"
+	]) {
+		const field = value[key];
+		if (field !== void 0) {
+			if (typeof field !== "string") return void 0;
+			parsedServer[key] = field;
+		}
+	}
+	return Object.keys(parsedServer).length > 0 ? parsedServer : void 0;
+}
+function hasLegacyRemoteServerFields(remote) {
+	return remote.url !== void 0 || remote.user !== void 0 || remote.password !== void 0;
+}
 function capletsRemoteStatusText(status, nerdFontIcons) {
 	if (nerdFontIcons) return status === "connected" ? "󰖟 caplets ✓" : "󰖟 caplets ×";
 	return status === "connected" ? "caplets ✓" : "caplets ×";
@@ -3509,12 +3527,13 @@ function capletsRemoteStatusText(status, nerdFontIcons) {
 function nativeServiceOptions(options) {
 	return {
 		...options.mode ? { mode: options.mode } : {},
+		...options.server ? { server: options.server } : {},
 		...options.remote ? { remote: options.remote } : {}
 	};
 }
 function shouldShowStatusWidget(options, statusWidget) {
 	if (statusWidget === false) return false;
-	return options.mode === "remote" || !!options.remote?.url || process.env.CAPLETS_REMOTE_URL !== void 0;
+	return options.mode === "remote" || !!options.server?.url || process.env.CAPLETS_SERVER_URL !== void 0;
 }
 async function readFileUtf8(path) {
 	return readFile(path, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caplets/pi",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Native Pi extension for Caplets.",
   "homepage": "https://github.com/spiritledsoftware/caplets#readme",
   "bugs": {
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@caplets/core": "0.16.0"
+    "@caplets/core": "0.17.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.0",