portable-agent-layer 0.84.2 → 0.84.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portable-agent-layer",
-  "version": "0.84.2",
+  "version": "0.84.3",
   "description": "PAL — Portable Agent Layer: persistent personal context for AI coding assistants",
   "type": "module",
   "bin": {

package/src/targets/copilot/install.ts

@@ -14,10 +14,9 @@ import {
   countSkills,
   loadCopilotHooksTemplate,
   log,
-  readJson,
   vscodeSettingsFile,
-  writeJson,
 } from "../lib";
+import { enableCopilotInstructions } from "../vscode-settings";
 
 const PKG_ROOT = palPkg().replaceAll("\\", "/");
 const COPILOT_DIR = platform.copilotDir();
@@ -58,18 +57,15 @@ const manualHint =
   'Add manually: { "chat.instructionsFilesLocations": { "~/.copilot/instructions": true } }';
 if (vsSettingsPath) {
   try {
-    const settings = readJson<Record<string, unknown>>(vsSettingsPath, {});
-    const existing =
-      typeof settings["chat.instructionsFilesLocations"] === "object" &&
-      settings["chat.instructionsFilesLocations"] !== null
-        ? (settings["chat.instructionsFilesLocations"] as Record<string, unknown>)
-        : {};
-    settings["chat.instructionsFilesLocations"] = {
-      ...existing,
-      "~/.copilot/instructions": true,
-    };
-    writeJson(vsSettingsPath, settings);
-    log.success("Enabled ~/.copilot/instructions in VS Code settings");
+    const outcome = enableCopilotInstructions(vsSettingsPath);
+    if (outcome === "enabled")
+      log.success("Enabled ~/.copilot/instructions in VS Code settings");
+    if (outcome === "needs-manual-edit")
+      log.warn(
+        `VS Code settings aren't plain JSON, so PAL left them untouched — ${manualHint}`
+      );
+    if (outcome === "vscode-never-launched")
+      log.info("Skipped VS Code settings — VS Code has not been launched yet");
   } catch {
     log.warn(`Could not update VS Code settings — ${manualHint}`);
   }

package/src/targets/vscode-settings.ts

@@ -0,0 +1,56 @@
+/**
+ * VS Code's settings.json is JSONC. PAL rewrites it only when it parses as
+ * strict JSON, because a rewrite would drop the user's comments.
+ */
+
+import { existsSync, readFileSync } from "node:fs";
+import { dirname } from "node:path";
+import { writeJson } from "./lib";
+
+const LOCATIONS_KEY = "chat.instructionsFilesLocations";
+const COPILOT_INSTRUCTIONS = "~/.copilot/instructions";
+
+type Settings = Record<string, unknown>;
+
+type InstructionsOutcome =
+  | "enabled"
+  | "already-enabled"
+  | "needs-manual-edit"
+  | "vscode-never-launched";
+
+function parsed(raw: string, parse: (text: string) => unknown): Settings | null {
+  try {
+    const value = parse(raw);
+    return typeof value === "object" && value !== null && !Array.isArray(value)
+      ? (value as Settings)
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function locationsOf(settings: Settings): Settings {
+  const locations = settings[LOCATIONS_KEY];
+  return typeof locations === "object" && locations !== null
+    ? (locations as Settings)
+    : {};
+}
+
+function writeEnabled(settingsPath: string, settings: Settings): InstructionsOutcome {
+  writeJson(settingsPath, {
+    ...settings,
+    [LOCATIONS_KEY]: { ...locationsOf(settings), [COPILOT_INSTRUCTIONS]: true },
+  });
+  return "enabled";
+}
+
+export function enableCopilotInstructions(settingsPath: string): InstructionsOutcome {
+  if (!existsSync(dirname(settingsPath))) return "vscode-never-launched";
+  if (!existsSync(settingsPath)) return writeEnabled(settingsPath, {});
+  const raw = readFileSync(settingsPath, "utf-8");
+  const settings = parsed(raw, Bun.JSONC.parse);
+  if (settings && locationsOf(settings)[COPILOT_INSTRUCTIONS] === true)
+    return "already-enabled";
+  const strict = parsed(raw, JSON.parse);
+  return strict ? writeEnabled(settingsPath, strict) : "needs-manual-edit";
+}