@caplets/pi 0.7.0 → 0.7.2

package/README.md

@@ -56,11 +56,9 @@ options are supplied:
   "packages": ["npm:@caplets/pi"],
   "caplets": {
     "mode": "remote",
-    "server": {
-      "url": "https://caplets.example.com/caplets",
-      "user": "caplets"
-    },
     "remote": {
+      "url": "https://caplets.example.com/caplets",
+      "user": "caplets",
       "pollIntervalMs": 5000
     },
     "statusWidget": true,
@@ -84,17 +82,15 @@ import { createCapletsPiExtension } from "@caplets/pi";
 export default createCapletsPiExtension({
   args: {
     mode: "remote",
-    server: {
+    remote: {
       url: "https://caplets.example.com/caplets",
       user: "caplets",
-    },
-    remote: {
       pollIntervalMs: 5_000,
     },
   },
 });
 ```
 
-The explicit config shape is `{ mode, server: { url, user }, remote: { pollIntervalMs } }`.
+The explicit config shape is `{ mode, remote: { url, user, pollIntervalMs } }`.
 Prefer environment variables for `CAPLETS_REMOTE_TOKEN` or `CAPLETS_REMOTE_PASSWORD` rather than storing passwords in
 settings files or source code.

package/dist/index.js

@@ -3463,27 +3463,42 @@ function topLevelCapletsOptions(settings, writeWarning, path) {
 		return parsed;
 	}
 }
-function parsePiNativeOptions(value, writeWarning, path = "settings.caplets") {
+function parsePiNativeOptions(value, _writeWarning, _path = "settings.caplets") {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
+	const raw = value;
 	const result = {};
-	const mode = value.mode;
+	const mode = raw.mode;
 	if (mode !== void 0) {
 		if (mode !== "auto" && mode !== "local" && mode !== "remote" && mode !== "cloud") return;
 		result.mode = mode;
 	}
-	const statusWidget = value.statusWidget;
+	const statusWidget = raw.statusWidget;
 	if (statusWidget !== void 0) {
 		if (typeof statusWidget !== "boolean") return void 0;
 		result.statusWidget = statusWidget;
 	}
-	const nerdFontIcons = value.nerdFontIcons;
+	const nerdFontIcons = raw.nerdFontIcons;
 	if (nerdFontIcons !== void 0) {
 		if (typeof nerdFontIcons !== "boolean") return void 0;
 		result.nerdFontIcons = nerdFontIcons;
 	}
 	const remote = objectProperty(value, "remote");
+	if (raw.remote !== void 0 && !remote) return;
 	if (remote) {
 		const parsedRemote = {};
+		for (const key of [
+			"url",
+			"user",
+			"password",
+			"token",
+			"workspace"
+		]) {
+			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;
@@ -3491,37 +3506,9 @@ function parsePiNativeOptions(value, writeWarning, path = "settings.caplets") {
 		}
 		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
-	};
+	if (raw.server !== void 0) return;
 	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 ×";
@@ -3529,14 +3516,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;
 	if (options.mode === "local") return false;
-	return options.mode === "remote" || options.mode === "cloud" || !!options.server?.url || process.env.CAPLETS_SERVER_URL !== void 0;
+	return options.mode === "remote" || options.mode === "cloud" || !!options.remote?.url || process.env.CAPLETS_REMOTE_URL !== void 0;
 }
 async function readFileUtf8(path) {
 	return readFile(path, "utf8");
@@ -3724,8 +3710,7 @@ function codeModeAgentContent(result) {
 	if (diagnostics.length > 0) compact.diagnostics = diagnostics;
 	const logSummary = codeModeLogSummary(logs);
 	if (logSummary) compact.logs = logSummary;
-	const durationMs = meta?.durationMs;
-	if (typeof durationMs === "number") compact.durationMs = durationMs;
+	if (meta) compact.meta = meta;
 	return [{
 		type: "text",
 		text: JSON.stringify(compact) ?? "null"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caplets/pi",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Native Pi extension for Caplets.",
   "homepage": "https://github.com/spiritledsoftware/caplets#readme",
   "bugs": {
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@caplets/core": "0.23.0"
+    "@caplets/core": "0.24.1"
   },
   "devDependencies": {
     "@jitl/quickjs-wasmfile-release-sync": "^0.32.0",