portable-agent-layer 0.63.0 → 0.63.2

package/src/hooks/lib/agent.ts

@@ -11,7 +11,7 @@
  * vars are used as secondary fallbacks for environments that forward them.
  */
 
-export type AgentType = "claude" | "cursor" | "codex" | "copilot" | "opencode";
+export type AgentType = "claude" | "cursor" | "codex" | "copilot" | "opencode" | "vscode";
 
 const KNOWN_AGENTS: ReadonlySet<AgentType> = new Set([
   "claude",
@@ -19,14 +19,33 @@ const KNOWN_AGENTS: ReadonlySet<AgentType> = new Set([
   "codex",
   "copilot",
   "opencode",
+  "vscode",
 ]);
 
+function agentFromEnv(): AgentType | undefined {
+  const explicit = process.env.PAL_AGENT;
+  return explicit && KNOWN_AGENTS.has(explicit as AgentType)
+    ? (explicit as AgentType)
+    : undefined;
+}
+
+/**
+ * `--agent=<name>` on the hook's own command line.
+ *
+ * An `PAL_AGENT=x cmd` prefix is POSIX-only and an `$env:PAL_AGENT='x'; cmd`
+ * prefix is PowerShell-only, so a hook config that guesses the host's shell
+ * wrong fails before the hook ever runs. An argv flag is shell-agnostic.
+ */
+function agentFromArgv(): AgentType | undefined {
+  const flag = process.argv.find((a) => a.startsWith("--agent="));
+  const value = flag?.slice("--agent=".length);
+  return value && KNOWN_AGENTS.has(value as AgentType) ? (value as AgentType) : undefined;
+}
+
 /** Detect which agent is currently running PAL. Defaults to "claude". */
 export function getActiveAgent(): AgentType {
-  const explicit = process.env.PAL_AGENT;
-  if (explicit && KNOWN_AGENTS.has(explicit as AgentType)) {
-    return explicit as AgentType;
-  }
+  const declared = agentFromArgv() ?? agentFromEnv();
+  if (declared) return declared;
   if (process.env.CURSOR_VERSION) return "cursor";
   if (process.env.CODEX_CLI_VERSION ?? process.env.OPENAI_CODEX) return "codex";
   return "claude";
@@ -37,17 +56,96 @@ export const isCursor = () => getActiveAgent() === "cursor";
 export const isCodex = () => getActiveAgent() === "codex";
 export const isCopilot = () => getActiveAgent() === "copilot";
 export const isOpencode = () => getActiveAgent() === "opencode";
+const isVscode = () => getActiveAgent() === "vscode";
+
+/** Normalized preToolUse request — one shape for every agent's payload. */
+export interface ToolUseRequest {
+  toolName: string;
+  toolInput: Record<string, unknown>;
+  hookEventName?: string;
+}
+
+function firstString(...values: unknown[]): string | undefined {
+  return values.find((v): v is string => typeof v === "string" && v.length > 0);
+}
+
+function firstObject(...values: unknown[]): Record<string, unknown> | undefined {
+  return values.find(
+    (v): v is Record<string, unknown> => typeof v === "object" && v !== null
+  );
+}
+
+/**
+ * Normalize a preToolUse payload across agents.
+ *
+ * Claude Code, Cursor, Codex — and Copilot's VS Code-compatible mode — send
+ * snake_case `tool_name` + `tool_input`. Copilot's native CLI payload sends
+ * camelCase `toolName` + `toolArgs`. A hook reading only one shape matches
+ * nothing on the other, which for a security hook silently means "allow".
+ */
+export function normalizeToolUse(raw: unknown): ToolUseRequest | null {
+  const payload = firstObject(raw);
+  if (!payload) return null;
+  const toolName = firstString(payload.tool_name, payload.toolName);
+  if (!toolName) return null;
+  return {
+    toolName,
+    toolInput: firstObject(payload.tool_input, payload.toolArgs, payload.toolInput) ?? {},
+    hookEventName: firstString(payload.hook_event_name, payload.hookEventName),
+  };
+}
 
 /**
  * Format a "block this action" response for the current agent.
- * Claude Code:       { decision: "block", reason }
- * Cursor preToolUse: { permission: "deny", user_message }
- * Codex PreToolUse:  { hookSpecificOutput: { hookEventName: "PreToolUse", permissionDecision: "deny", permissionDecisionReason: reason } }
+ * Claude Code / VS Code: both spellings at once — see claudeBlock below
+ * Cursor preToolUse:     { permission: "deny", user_message }
+ * Copilot preToolUse:    { permissionDecision: "deny", permissionDecisionReason }
+ * Copilot agentStop:     { decision: "block", reason }
+ * Codex PreToolUse:      { hookSpecificOutput: { hookEventName: "PreToolUse", permissionDecision: "deny", permissionDecisionReason: reason } }
+ *
+ * A stop event denies the whole turn, not one tool call, so it carries a
+ * decision rather than a permission — callers must name the event to get it.
  */
+function isStopEvent(hookEventName?: string): boolean {
+  return hookEventName === "Stop" || hookEventName === "agentStop";
+}
+
+/**
+ * One payload both Claude Code and VS Code's own Copilot build accept.
+ *
+ * VS Code reads every decision from inside hookSpecificOutput and ignores the
+ * top-level keys; Claude Code reads the top-level keys and ignores the extra
+ * object (verified against `claude -p`: a turn carrying both is still blocked).
+ * Since VS Code also executes the hooks registered in ~/.claude/settings.json,
+ * carrying both spellings here is what lets one registration serve both — a
+ * second VS Code-specific hooks file made every event run twice.
+ */
+function claudeBlock(reason: string, hookEventName?: string): string {
+  return JSON.stringify({
+    decision: "block",
+    reason,
+    hookSpecificOutput: isStopEvent(hookEventName)
+      ? { hookEventName: "Stop", decision: "block", reason }
+      : {
+          hookEventName: "PreToolUse",
+          permissionDecision: "deny",
+          permissionDecisionReason: reason,
+        },
+  });
+}
+
 export function blockResponse(reason: string, hookEventName?: string): string {
   if (isCursor()) {
     return JSON.stringify({ permission: "deny", user_message: reason });
   }
+  if (isCopilot()) {
+    return isStopEvent(hookEventName)
+      ? JSON.stringify({ decision: "block", reason })
+      : JSON.stringify({
+          permissionDecision: "deny",
+          permissionDecisionReason: reason,
+        });
+  }
   if (isCodex() && hookEventName === "PreToolUse") {
     return JSON.stringify({
       hookSpecificOutput: {
@@ -57,5 +155,11 @@ export function blockResponse(reason: string, hookEventName?: string): string {
       },
     });
   }
+  // Only the surfaces that share ~/.claude/settings.json need both spellings.
+  // Handing the extra key to codex or opencode would be a shape they never
+  // asked to parse, for a duplication problem they don't have.
+  if (isClaude() || isVscode()) {
+    return claudeBlock(reason, hookEventName);
+  }
   return JSON.stringify({ decision: "block", reason });
 }

package/src/hooks/lib/security.ts

@@ -5,6 +5,77 @@
 
 import { lstatSync } from "node:fs";
 
+// PowerShell aliases rm, rmdir, del, erase, rd and ri all to Remove-Item, and
+// cmd ships its own rd and del — so the verb alone never says which shell ran it.
+const WIN_DELETE_VERB = "(?:remove-item|rmdir|erase|del|rd|rm|ri)";
+
+// -r through -Recurse all bind in PowerShell; cmd's rd/del spell it /s.
+const WIN_RECURSE_FLAG = String.raw`(?:-(?:r(?:e(?:c(?:u(?:r(?:se?)?)?)?)?)?f?|fr)|/s)\b`;
+
+/**
+ * A whole root, not a directory inside one. The trailing lookahead is the part
+ * that matters: without it `C:\` prefix-matches `C:\Users\rico\dist` and every
+ * ordinary recursive delete on Windows gets blocked.
+ */
+const WIN_ROOT_TARGET = String.raw`["']?(?:[a-z]:[\\/]?\*?|\\\\|~|\$home|\$env:userprofile|\$env:systemdrive)["']?(?=["'\s;,)]|$)`;
+
+const WIN_DOWNLOAD = "(?:iwr|irm|curl|wget|invoke-webrequest|invoke-restmethod)";
+const WIN_EVAL = "(?:iex|invoke-expression)";
+
+/**
+ * Something is about to be run, rather than merely named. `format` and
+ * `diskpart` are bare enough to collide with ordinary text — a PR title reading
+ * `fix: format C: handling` or `rg 'diskpart' docs/` are not disk operations.
+ * The optional wrapper keeps `powershell -c "format C:"` in scope.
+ */
+const SHELL_WRAPPER = String.raw`(?:(?:sudo|powershell(?:\.exe)?|pwsh|cmd(?:\.exe)?)\s+(?:[-/]\w+\s+)*)?`;
+const COMMAND_POSITION = String.raw`(?:^|[|;&\n({])\s*${SHELL_WRAPPER}["']?`;
+
+/**
+ * Start-Process/runas/gsudo hand the target to a flag (-FilePath, -ArgumentList)
+ * or a positional slot after other flags, in either order — COMMAND_POSITION's
+ * fixed wrapper-then-verb shape can't follow that. Since nobody launches a
+ * process via Start-Process to hold a PR title, an elevation wrapper anywhere in
+ * the command is itself enough license to drop the position anchor entirely.
+ */
+/**
+ * Both lookaheads stop at |, ; and & so they cannot reach across a command
+ * boundary — otherwise `rm -r build; echo C:\` reads as a root delete.
+ */
+const WIN_ROOT_DELETE = new RegExp(
+  String.raw`${COMMAND_POSITION}${WIN_DELETE_VERB}\b(?=[^|;&\n]*\s${WIN_RECURSE_FLAG})(?=[^|;&\n]*\s${WIN_ROOT_TARGET})`,
+  "i"
+);
+
+const WIN_FORMAT_COMMAND = new RegExp(
+  String.raw`${COMMAND_POSITION}format(?:\s+["']?[a-z]:|-volume\b)`,
+  "i"
+);
+const WIN_DISKPART_COMMAND = new RegExp(String.raw`${COMMAND_POSITION}diskpart\b`, "i");
+
+/**
+ * Start-Process/runas/gsudo hand the target to a flag (-FilePath, -ArgumentList)
+ * or a positional slot after other flags, in either order — COMMAND_POSITION's
+ * fixed wrapper-then-verb shape can't follow that, and a single combined regex
+ * can't either: a lookahead only sees forward from the verb, so it misses
+ * `Start-Process -Verb RunAs -FilePath diskpart` where the wrapper comes first.
+ * Two independent whole-string checks (wrapper present, threat present anywhere)
+ * sidestep the ordering problem entirely. Nobody launches a process via
+ * Start-Process to hold a PR title, so no position anchor is needed here.
+ */
+const WIN_ELEVATION_WRAPPER = /\b(?:start-process|runas|gsudo)\b/i;
+const WIN_ELEVATED_THREATS: [RegExp, string][] = [
+  [
+    new RegExp(
+      String.raw`\b${WIN_DELETE_VERB}\b(?=[^|;&\n]*\s${WIN_RECURSE_FLAG})(?=[^|;&\n]*\s${WIN_ROOT_TARGET})`,
+      "i"
+    ),
+    "Recursive delete of a drive root or home",
+  ],
+  [/\bformat(?:\s+["']?[a-z]:|-volume\b)/i, "Disk format"],
+  [/\bdiskpart\b/i, "Disk partitioning"],
+];
+
 /** Dangerous command patterns — always blocked */
 const BLOCKED_COMMANDS: [RegExp, string][] = [
   [/rm\s+-rf\s+[/~]/, "Recursive delete of root or home"],
@@ -15,6 +86,20 @@ const BLOCKED_COMMANDS: [RegExp, string][] = [
   [/:\(\)\{\s*:\|:&\s*\};:/, "Fork bomb"],
   [/curl.*\|\s*(?:ba)?sh/, "Pipe to shell"],
   [/wget.*\|\s*(?:ba)?sh/, "Pipe to shell"],
+  [WIN_ROOT_DELETE, "Recursive delete of a drive root or home"],
+  [WIN_FORMAT_COMMAND, "Disk format"],
+  [WIN_DISKPART_COMMAND, "Disk partitioning"],
+  [
+    new RegExp(String.raw`\b${WIN_DOWNLOAD}\b[^|\n]*\|\s*${WIN_EVAL}\b`, "i"),
+    "Pipe to shell",
+  ],
+  [
+    new RegExp(
+      String.raw`\b${WIN_EVAL}\b[^|\n]*(?:downloadstring|downloadfile|new-object\s+(?:system\.)?net\.webclient|\b${WIN_DOWNLOAD}\b)`,
+      "i"
+    ),
+    "Download and execute",
+  ],
 ];
 
 /** Hook-managed files — single source of truth */
@@ -99,6 +184,11 @@ export function checkBashCommand(cmd: string): string | null {
   for (const [pattern, reason] of BLOCKED_COMMANDS) {
     if (pattern.test(cmd)) return reason;
   }
+  if (WIN_ELEVATION_WRAPPER.test(cmd)) {
+    for (const [pattern, reason] of WIN_ELEVATED_THREATS) {
+      if (pattern.test(cmd)) return reason;
+    }
+  }
   // If command references a managed file in a managed root path, block unless read-only.
   // The filename must appear IN the same path as the managed root (e.g. .pal/.../file.json).
   const segments = cmd.split(/[|;&&]/).map((s) => s.trim());

package/src/hooks/lib/transcript.ts

@@ -20,9 +20,42 @@ export function parseMessages(raw: string): Message[] {
   }
 }
 
+function claudeCodeEntryText(msg: { content?: unknown }): string {
+  if (typeof msg.content === "string") return msg.content;
+  if (Array.isArray(msg.content)) {
+    return msg.content
+      .filter((c: { type: string }) => c.type === "text")
+      .map((c: { text: string }) => c.text)
+      .join(" ");
+  }
+  return "";
+}
+
+// Claude Code tags transcript lines `type: "user"|"assistant"` with the text
+// under `message.content`. VS Code Copilot's own event log instead uses
+// `type: "user.message"|"assistant.message"` with a flat `data.content`
+// string — two shapes sharing one transcript_path contract across agents.
+function parseTranscriptEntry(entry: {
+  type?: string;
+  message?: { content?: unknown };
+  data?: { content?: unknown };
+}): Message | null {
+  if (entry.type === "user" || entry.type === "assistant") {
+    const text = claudeCodeEntryText(entry.message ?? {});
+    return text ? { role: entry.type, content: text } : null;
+  }
+  if (entry.type === "user.message" || entry.type === "assistant.message") {
+    const text = entry.data?.content;
+    const role = entry.type === "user.message" ? "user" : "assistant";
+    return typeof text === "string" && text ? { role, content: text } : null;
+  }
+  return null;
+}
+
 /**
- * Read a Claude Code transcript JSONL file and extract user/assistant messages.
- * Each line is a JSON object; we extract entries with type "user" or "assistant".
+ * Read an agent transcript JSONL file and extract user/assistant messages.
+ * Supports Claude Code's `{type:"user"|"assistant", message:{content}}` shape
+ * and VS Code Copilot's `{type:"user.message"|"assistant.message", data:{content}}` shape.
  */
 export function readTranscriptFile(path: string): Message[] {
   try {
@@ -32,22 +65,8 @@ export function readTranscriptFile(path: string): Message[] {
     for (const line of content.split("\n")) {
       if (!line.trim()) continue;
       try {
-        const entry = JSON.parse(line);
-        if (entry.type === "user" || entry.type === "assistant") {
-          const msg = entry.message ?? {};
-          let text = "";
-          if (typeof msg.content === "string") {
-            text = msg.content;
-          } else if (Array.isArray(msg.content)) {
-            text = msg.content
-              .filter((c: { type: string }) => c.type === "text")
-              .map((c: { text: string }) => c.text)
-              .join(" ");
-          }
-          if (text) {
-            messages.push({ role: entry.type, content: text });
-          }
-        }
+        const parsed = parseTranscriptEntry(JSON.parse(line));
+        if (parsed) messages.push(parsed);
       } catch {
         /* skip malformed lines */
       }

package/src/targets/claude/install.ts

@@ -6,25 +6,21 @@
 
 import { copyFileSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { regenerateIfNeeded } from "../../hooks/lib/claude-md";
 import { assets, palHome, palPkg, platform } from "../../hooks/lib/paths";
 import { identity, raw as readPalSettings } from "../../hooks/lib/settings";
 import {
   addStatuslineConfig,
   applyAttribution,
   copyAgents,
-  copyPalDocs,
   copySkills,
   copyStatusline,
   countAgents,
   countMd,
   countSkills,
-  generateSkillIndex,
   loadSettingsTemplate,
   log,
   mergeSettings,
   readJson,
-  scaffoldPalSettings,
   writeJson,
 } from "../lib";
 
@@ -68,7 +64,6 @@ log.success("Merged PAL settings into settings.json");
 // --- Copy skills ---
 const skillsDir = resolve(CLAUDE_DIR, "skills");
 copySkills(skillsDir);
-generateSkillIndex();
 
 // --- Copy agents ---
 copyAgents();
@@ -76,19 +71,6 @@ copyAgents();
 // --- Copy statusline script ---
 copyStatusline();
 
-// --- Copy PAL system docs ---
-const palDocsCount = copyPalDocs();
-log.success(`Installed ${palDocsCount} PAL docs to ~/.pal/docs/`);
-
-// --- Scaffold PAL settings ---
-scaffoldPalSettings();
-
-// --- Generate ~/.claude/AGENTS.md and symlink ~/.claude/CLAUDE.md → AGENTS.md ---
-regenerateIfNeeded();
-log.success("Generated ~/.config/opencode/AGENTS.md (→ ~/.claude/CLAUDE.md symlink)");
-
-log.success("Claude Code installation complete");
-console.log("");
-log.info(`Skills: ${countSkills()}`);
-log.info(`Agents: ${countAgents()}`);
-log.info(`TELOS: ${countMd(resolve(palHome(), "telos"))} files`);
+log.success(
+  `${countSkills()} skills · ${countAgents()} agents · ${countMd(resolve(palHome(), "telos"))} TELOS files · CLAUDE.md → AGENTS.md`
+);

package/src/targets/codex/install.ts

@@ -12,20 +12,17 @@ import {
   writeFileSync,
 } from "node:fs";
 import { resolve } from "node:path";
-import { regenerateIfNeeded } from "../../hooks/lib/claude-md";
 import { assets, palPkg, platform } from "../../hooks/lib/paths";
 import {
   addCodexStatuslineConfig,
   copySkills,
   countSkills,
-  generateSkillIndex,
   loadCodexHooksTemplate,
   loadCodexRulesTemplate,
   log,
   mergeCodexHooks,
   mergeCodexRules,
   readJson,
-  scaffoldPalSettings,
   writeJson,
 } from "../lib";
 
@@ -86,7 +83,7 @@ const existing = readJson<Record<string, unknown>>(HOOKS_FILE, {});
 const merged = mergeCodexHooks(existing, template);
 
 writeJson(HOOKS_FILE, merged);
-log.success("Merged PAL hooks into ~/.codex/hooks.json");
+log.success(`Merged PAL hooks into ${HOOKS_FILE}`);
 
 // --- Merge allowlist rules ---
 mkdirSync(resolve(CODEX_DIR, "rules"), { recursive: true });
@@ -102,21 +99,9 @@ log.success("Merged PAL allowlist rules into ~/.codex/rules/default.rules");
 // --- Symlink skills to ~/.codex/skills/ ---
 const codexSkillsDir = resolve(CODEX_DIR, "skills");
 copySkills(codexSkillsDir);
-generateSkillIndex();
-
-// --- Scaffold PAL settings ---
-scaffoldPalSettings();
-
-// --- Generate / verify AGENTS.md symlink ---
-regenerateIfNeeded();
-log.success("Ensured AGENTS.md symlink at ~/.codex/AGENTS.md");
+log.success(`${countSkills()} skills → ~/.codex/skills/`);
 
 // --- Enable hooks in config.toml ---
 const CONFIG_FILE = resolve(CODEX_DIR, "config.toml");
 enableCodexHooks(CONFIG_FILE);
 enableCodexStatusline(CONFIG_FILE);
-
-log.success("Codex installation complete");
-console.log("");
-log.info(`Skills: ${countSkills()}`);
-log.info(`Hooks: ${HOOKS_FILE}`);

package/src/targets/copilot/install.ts

@@ -5,21 +5,16 @@
  * Enables ~/.copilot/instructions in VS Code chat.instructionsFilesLocations.
  */
 
-import { mkdirSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { writeContextDigests } from "../../hooks/handlers/context-digests";
-import { regenerateIfNeeded } from "../../hooks/lib/claude-md";
 import { assets, palPkg, platform } from "../../hooks/lib/paths";
 import {
   copyAgentsForCopilot,
-  copyPalDocs,
   copySkills,
   countSkills,
-  generateSkillIndex,
   loadCopilotHooksTemplate,
   log,
   readJson,
-  scaffoldPalSettings,
   vscodeSettingsFile,
   writeJson,
 } from "../lib";
@@ -28,6 +23,7 @@ const PKG_ROOT = palPkg().replaceAll("\\", "/");
 const COPILOT_DIR = platform.copilotDir();
 const HOOKS_DIR = resolve(COPILOT_DIR, "hooks");
 const HOOKS_FILE = resolve(HOOKS_DIR, "pal-hooks.json");
+const VSCODE_HOOKS_FILE = resolve(HOOKS_DIR, "pal-vscode-hooks.json");
 
 // --- Ensure dirs ---
 mkdirSync(HOOKS_DIR, { recursive: true });
@@ -37,34 +33,24 @@ const template = loadCopilotHooksTemplate(assets.copilotHooksTemplate(), PKG_ROO
 writeFileSync(HOOKS_FILE, `${JSON.stringify(template, null, 2)}\n`, "utf-8");
 log.success(`Written hooks to ${HOOKS_FILE}`);
 
+// --- Retire the separate VS Code hooks file ---
+// VS Code's own Copilot build already executes the PascalCase hooks in
+// ~/.claude/settings.json, so registering the same events here too ran every
+// hook twice per turn. One dual-shape block payload (see lib/agent.ts) now
+// serves both surfaces from that single registration.
+if (existsSync(VSCODE_HOOKS_FILE)) {
+  unlinkSync(VSCODE_HOOKS_FILE);
+  log.success("Removed pal-vscode-hooks.json (VS Code runs the Claude hooks)");
+}
+
 // --- Install skills ---
 const copilotSkillsDir = resolve(COPILOT_DIR, "skills");
 copySkills(copilotSkillsDir);
-generateSkillIndex();
-log.success("Installed skills to ~/.copilot/skills/");
 
 // --- Install agents ---
 const copilotAgentsDir = resolve(COPILOT_DIR, "agents");
 const agentCount = copyAgentsForCopilot(copilotAgentsDir);
-if (agentCount > 0) log.success(`Installed ${agentCount} agents to ~/.copilot/agents/`);
-
-// --- Copy PAL docs ---
-const palDocsCount = copyPalDocs();
-log.success(`Installed ${palDocsCount} PAL docs to ~/.pal/docs/`);
-
-// --- Scaffold PAL settings ---
-scaffoldPalSettings();
-
-// --- Generate AGENTS.md ---
-regenerateIfNeeded();
-log.success("Generated AGENTS.md");
-
-// --- Write ~/.copilot/instructions/pal-*.instructions.md ---
-mkdirSync(resolve(COPILOT_DIR, "instructions"), { recursive: true });
-writeContextDigests();
-log.success(
-  "Written ~/.copilot/instructions/pal-self-model + pal-wisdom + pal-opinions.instructions.md"
-);
+log.success(`${countSkills()} skills · ${agentCount} agents → ~/.copilot/`);
 
 // --- Enable ~/.copilot/instructions in VS Code settings ---
 const vsSettingsPath = vscodeSettingsFile();
@@ -90,8 +76,3 @@ if (vsSettingsPath) {
 } else {
   log.warn(`Could not detect VS Code settings path — ${manualHint}`);
 }
-
-log.success("Copilot installation complete");
-console.log("");
-log.info(`Skills: ${countSkills()}`);
-log.info(`Hooks: ${HOOKS_FILE}`);

package/src/targets/copilot/uninstall.ts

@@ -7,11 +7,11 @@
 import { copyFileSync, existsSync, lstatSync, readlinkSync, unlinkSync } from "node:fs";
 import { resolve } from "node:path";
 import { platform } from "../../hooks/lib/paths";
-import { copilotFilename, getSemiStaticSources } from "../../hooks/lib/semi-static";
 import {
   log,
   readJson,
   removeAgentsFromCopilot,
+  removePalContextFiles,
   removePalDocs,
   removeSkills,
   vscodeSettingsFile,
@@ -20,16 +20,22 @@ import {
 
 const COPILOT_DIR = platform.copilotDir();
 const HOOKS_FILE = resolve(COPILOT_DIR, "hooks", "pal-hooks.json");
+const VSCODE_HOOKS_FILE = resolve(COPILOT_DIR, "hooks", "pal-vscode-hooks.json");
 
-// --- Remove hooks file ---
-if (existsSync(HOOKS_FILE)) {
-  copyFileSync(HOOKS_FILE, `${HOOKS_FILE}.bak.${Date.now()}`);
-  unlinkSync(HOOKS_FILE);
-  log.success("Removed pal-hooks.json");
-} else {
-  log.info("No pal-hooks.json found, nothing to do");
+// --- Remove hooks files ---
+function removeHooksFile(path: string, label: string): void {
+  if (!existsSync(path)) {
+    log.info(`No ${label} found, nothing to do`);
+    return;
+  }
+  copyFileSync(path, `${path}.bak.${Date.now()}`);
+  unlinkSync(path);
+  log.success(`Removed ${label}`);
 }
 
+removeHooksFile(HOOKS_FILE, "pal-hooks.json");
+removeHooksFile(VSCODE_HOOKS_FILE, "pal-vscode-hooks.json");
+
 // --- Remove skill symlinks ---
 const copilotSkillsDir = resolve(COPILOT_DIR, "skills");
 const removed = removeSkills(copilotSkillsDir);
@@ -49,20 +55,13 @@ if (removedAgents.length > 0) {
 removePalDocs();
 
 // --- Remove ~/.copilot/instructions/pal-*.instructions.md ---
-for (const src of getSemiStaticSources()) {
-  try {
-    unlinkSync(resolve(COPILOT_DIR, "instructions", copilotFilename(src)));
-  } catch {
-    /* gone */
-  }
-}
-// pal-session.instructions.md is written by LoadContext (not a semi-static source)
-try {
-  unlinkSync(resolve(COPILOT_DIR, "instructions", "pal-session.instructions.md"));
-} catch {
-  /* gone */
-}
-log.success("Removed ~/.copilot/instructions/pal-*.instructions.md");
+const removedInstructions = removePalContextFiles(
+  resolve(COPILOT_DIR, "instructions"),
+  ".instructions.md"
+);
+log.success(
+  `Removed ${removedInstructions.length} ~/.copilot/instructions/pal-*.instructions.md`
+);
 
 // --- Backward compat: remove old copilot-instructions.md symlink if present ---
 const legacyPath = resolve(COPILOT_DIR, "copilot-instructions.md");

package/src/targets/cursor/install.ts

@@ -6,22 +6,17 @@
 
 import { copyFileSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { writeContextDigests } from "../../hooks/handlers/context-digests";
-import { regenerateIfNeeded } from "../../hooks/lib/claude-md";
 import { assets, palPkg, platform } from "../../hooks/lib/paths";
 import {
   addStatuslineConfig,
   copyAgentsForCursor,
-  copyPalDocs,
   copySkills,
   copyStatusline,
   countSkills,
-  generateSkillIndex,
   loadCursorHooksTemplate,
   log,
   mergeCursorHooks,
   readJson,
-  scaffoldPalSettings,
   writeJson,
 } from "../lib";
 
@@ -45,24 +40,16 @@ const existing = readJson<Record<string, unknown>>(HOOKS_FILE, {});
 const merged = mergeCursorHooks(existing, template);
 
 writeJson(HOOKS_FILE, merged);
-log.success("Merged PAL hooks into hooks.json");
+log.success(`Merged PAL hooks into ${HOOKS_FILE}`);
 
 // --- Symlink skills to ~/.cursor/skills/ ---
 const cursorSkillsDir = resolve(CURSOR_DIR, "skills");
 copySkills(cursorSkillsDir);
-generateSkillIndex();
 
 // --- Copy agents to ~/.cursor/agents/ ---
 const cursorAgentsDir = resolve(CURSOR_DIR, "agents");
 const agentCount = copyAgentsForCursor(cursorAgentsDir);
-if (agentCount > 0) log.success(`Installed ${agentCount} agents to ~/.cursor/agents/`);
-
-// --- Copy PAL system docs ---
-const palDocsCount = copyPalDocs();
-log.success(`Installed ${palDocsCount} PAL docs to ~/.pal/docs/`);
-
-// --- Scaffold PAL settings ---
-scaffoldPalSettings();
+log.success(`${countSkills()} skills · ${agentCount} agents → ~/.cursor/`);
 
 // --- Statusline script + cli-config.json statusLine ---
 copyStatusline("cursor");
@@ -77,21 +64,6 @@ const cliConfig = readJson<Record<string, unknown>>(CLI_CONFIG, {});
 writeJson(CLI_CONFIG, addStatuslineConfig(cliConfig, "cursor"));
 log.success("Merged statusLine into cli-config.json");
 
-// --- Generate AGENTS.md ---
-regenerateIfNeeded();
-log.success("Generated AGENTS.md");
-
-// --- Write ~/.cursor/rules/pal-*.mdc ---
-mkdirSync(resolve(CURSOR_DIR, "rules"), { recursive: true });
-writeContextDigests();
-log.success(
-  "Written ~/.cursor/rules/pal-self-model.mdc + pal-wisdom.mdc + pal-opinions.mdc"
-);
-
-log.success("Cursor installation complete");
-console.log("");
-log.info(`Skills: ${countSkills()}`);
-log.info(`Hooks: ${HOOKS_FILE}`);
 log.info(
   "Note: Cursor tool matchers may need tuning — verify hook behavior after first use"
 );