@omercnet/paseo-omp 0.2.1 → 0.3.0-next.91.1

package/server/omp-settings.ts

@@ -1,6 +1,9 @@
-import { createHash } from "node:crypto";
-import { delimiter, isAbsolute } from "node:path";
+import { createHash, randomUUID } from "node:crypto";
+import { lstat, mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { delimiter, dirname, isAbsolute, join } from "node:path";
 import type { RpcInput } from "@getpaseo/plugin";
+import { parseDocument, parse as parseYaml } from "yaml";
 import {
   type listOmpSettings,
   OMP_SETTINGS_CATALOG_VERSION,
@@ -12,6 +15,7 @@ import {
 } from "../shared/omp-settings";
 import { SerialMutationQueue } from "./mutation-queue";
 import { readOmpConfigFrom } from "./omp-config";
+import { currentOmpEnvironment } from "./paths";
 import {
   type BoundedRun,
   buildStatefulCommandEnv,
@@ -54,7 +58,103 @@ export type OmpSettingsUpdateResult = {
 
 export interface OmpSettingsDependencies {
   resolveExecutable(): Promise<string | null>;
-  runConfig(executable: string, args: readonly string[]): Promise<BoundedRun>;
+  runConfig(executable: string, args: readonly string[], cwd?: string): Promise<BoundedRun>;
+  validateProjectConfig(executable: string, path: string): Promise<BoundedRun>;
+}
+
+async function readProjectConfigText(path: string): Promise<string> {
+  try {
+    return await readFile(path, "utf8");
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return "{}\n";
+    throw error;
+  }
+}
+
+function runSucceeded(result: BoundedRun): boolean {
+  return (
+    result.outcome === "exited" &&
+    result.exitCode === 0 &&
+    result.signal === null &&
+    !result.truncated &&
+    !result.cleanupFailed
+  );
+}
+
+async function writeProjectChanges(
+  cwd: string,
+  expectedText: string,
+  changes: RpcInput<typeof updateOmpSettings>["changes"],
+  executable: string,
+  dependencies: OmpSettingsDependencies,
+): Promise<"applied" | "conflict"> {
+  const path = join(cwd, ".omp", "config.yml");
+  try {
+    const metadata = await lstat(path);
+    if (metadata.isSymbolicLink()) {
+      throw new Error("Symlinked workspace OMP configuration cannot be edited through Paseo.");
+    }
+    if (!metadata.isFile()) throw new Error("Workspace OMP configuration is not a regular file.");
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+  }
+
+  const snapshot = await readProjectConfigText(path);
+  if (snapshot !== expectedText) return "conflict";
+  const document = parseDocument(snapshot);
+  if (document.errors.length > 0) throw new Error("Workspace OMP configuration is invalid YAML.");
+  for (const change of changes) {
+    const segments = change.path.split(".");
+    if (change.operation === "reset") document.deleteIn(segments);
+    else document.setIn(segments, change.value);
+  }
+
+  await mkdir(dirname(path), { recursive: true });
+  const temporaryPath = `${path}.${randomUUID()}.tmp`;
+  try {
+    await writeFile(temporaryPath, document.toString(), { encoding: "utf8", mode: 0o600 });
+    const validation = await dependencies.validateProjectConfig(executable, temporaryPath);
+    if (!runSucceeded(validation)) {
+      throw new Error("OMP rejected the workspace configuration change.");
+    }
+    if ((await readProjectConfigText(path)) !== snapshot) return "conflict";
+    await rename(temporaryPath, path);
+    return "applied";
+  } finally {
+    await unlink(temporaryPath).catch(() => {});
+  }
+}
+
+function hasConfiguredPath(value: unknown, path: string): boolean {
+  let current = value;
+  for (const segment of path.split(".")) {
+    if (current === null || typeof current !== "object" || Array.isArray(current)) return false;
+    const record = current as Record<string, unknown>;
+    if (!Object.hasOwn(record, segment)) return false;
+    current = record[segment];
+  }
+  return true;
+}
+
+async function markWorkspaceOverrides(cwd: string, settings: OmpSetting[]): Promise<OmpSetting[]> {
+  const directory = join(cwd, ".omp");
+  const sources: unknown[] = [];
+  try {
+    sources.push(JSON.parse(await readFile(join(directory, "settings.json"), "utf8")) as unknown);
+  } catch {
+    // Legacy project settings are optional.
+  }
+  try {
+    sources.push(parseYaml(await readFile(join(directory, "config.yml"), "utf8")) as unknown);
+  } catch {
+    // Canonical project settings are optional.
+  }
+  if (sources.length === 0) return settings;
+  return settings.map((setting) =>
+    sources.some((source) => hasConfiguredPath(source, setting.path))
+      ? { ...setting, workspaceOverride: true }
+      : setting,
+  );
 }
 
 function isCredentialSetting(path: string, type: OmpSettingType): boolean {
@@ -101,37 +201,52 @@ export function parseOmpSettingsList(raw: unknown): ParsedOmpSettings {
 
 async function resolveOmpExecutable(): Promise<string | null> {
   return resolveExecutablePath(
-    process.env.OMP_COMMAND ?? "omp",
-    (process.env.PATH ?? "").split(delimiter),
+    currentOmpEnvironment().OMP_COMMAND ?? "omp",
+    (currentOmpEnvironment().PATH ?? "").split(delimiter),
     {
       cwd: process.cwd(),
       platform: process.platform,
-      pathExt: process.env.PATHEXT ?? WINDOWS_DEFAULT_PATHEXT,
+      pathExt: currentOmpEnvironment().PATHEXT ?? WINDOWS_DEFAULT_PATHEXT,
     },
   );
 }
 
-async function runOmpConfig(executable: string, args: readonly string[]) {
+async function runOmpConfig(executable: string, args: readonly string[], cwd = process.cwd()) {
   return runBounded(
     defaultSpawn,
     executable,
     ["config", ...args],
-    buildStatefulCommandEnv(process.env),
+    buildStatefulCommandEnv(currentOmpEnvironment()),
     CONFIG_TIMEOUT_MS,
     KILL_GRACE_MS,
     MAX_CONFIG_OUTPUT_BYTES,
-    process.cwd(),
+    cwd,
+  );
+}
+
+async function validateOmpProjectConfig(executable: string, path: string): Promise<BoundedRun> {
+  return runBounded(
+    defaultSpawn,
+    executable,
+    ["--config", path, "config", "list", "--json"],
+    buildStatefulCommandEnv(currentOmpEnvironment()),
+    CONFIG_TIMEOUT_MS,
+    KILL_GRACE_MS,
+    MAX_CONFIG_OUTPUT_BYTES,
+    tmpdir(),
   );
 }
 
 const DEFAULT_DEPENDENCIES: OmpSettingsDependencies = {
   resolveExecutable: resolveOmpExecutable,
   runConfig: runOmpConfig,
+  validateProjectConfig: validateOmpProjectConfig,
 };
 
 async function loadCatalog(
   executable: string | null | undefined,
   dependencies: OmpSettingsDependencies,
+  cwd?: string,
 ): Promise<CatalogResult> {
   const resolved = executable === undefined ? await dependencies.resolveExecutable() : executable;
   if (!resolved) {
@@ -144,7 +259,7 @@ async function loadCatalog(
     };
   }
 
-  const result = await dependencies.runConfig(resolved, ["list", "--json"]);
+  const result = await dependencies.runConfig(resolved, ["list", "--json"], cwd);
   if (result.outcome !== "exited" || result.exitCode !== 0 || result.truncated) {
     return {
       catalogVersion: OMP_SETTINGS_CATALOG_VERSION,
@@ -159,23 +274,25 @@ async function loadCatalog(
   }
 
   let path: string | undefined;
-  const pathResult = await dependencies.runConfig(resolved, ["path"]);
+  const pathResult = await dependencies.runConfig(resolved, ["path"], cwd);
   const agentDir =
     pathResult.outcome === "exited" && pathResult.exitCode === 0 ? pathResult.stdout.trim() : "";
   if (agentDir && isAbsolute(agentDir) && !agentDir.includes("\0")) {
     path = (await readOmpConfigFrom(agentDir)).path;
   }
-
   try {
     const parsed: unknown = JSON.parse(result.stdout);
     const catalog = parseOmpSettingsList(parsed);
+    const projectPath = cwd ? join(cwd, ".omp", "config.yml") : null;
+    const projectText = projectPath ? await readProjectConfigText(projectPath) : "";
+    const revision = createHash("sha256").update(result.stdout).update(projectText).digest("hex");
     return {
       catalogVersion: OMP_SETTINGS_CATALOG_VERSION,
       available: true,
-      revision: createHash("sha256").update(result.stdout).digest("hex"),
+      revision,
       droppedCount: catalog.droppedCount,
-      ...(path ? { path } : {}),
-      settings: catalog.settings,
+      ...(projectPath ? { path: projectPath } : path ? { path } : {}),
+      settings: cwd ? await markWorkspaceOverrides(cwd, catalog.settings) : catalog.settings,
     };
   } catch {
     return {
@@ -197,10 +314,19 @@ function serializeScalar(type: OmpSettingType, value: OmpScalarValue): string |
 }
 
 export async function listOmpSettingsWithDependencies(
-  _input: RpcInput<typeof listOmpSettings>,
+  input: RpcInput<typeof listOmpSettings>,
   dependencies: OmpSettingsDependencies,
 ): Promise<CatalogResult> {
-  return loadCatalog(undefined, dependencies);
+  if (input.cwd && (!isAbsolute(input.cwd) || input.cwd.includes("\0"))) {
+    return {
+      catalogVersion: OMP_SETTINGS_CATALOG_VERSION,
+      available: false,
+      droppedCount: 0,
+      settings: [],
+      error: "The workspace path is invalid.",
+    };
+  }
+  return loadCatalog(undefined, dependencies, input.cwd);
 }
 
 export async function resolveListOmpSettings(
@@ -213,8 +339,22 @@ export async function updateOmpSettingsWithDependencies(
   input: RpcInput<typeof updateOmpSettings>,
   dependencies: OmpSettingsDependencies,
 ): Promise<OmpSettingsUpdateResult> {
+  if (input.cwd && (!isAbsolute(input.cwd) || input.cwd.includes("\0"))) {
+    return {
+      conflict: false,
+      appliedPaths: [],
+      failed: { path: "configuration", message: "The workspace path is invalid." },
+      catalog: {
+        catalogVersion: OMP_SETTINGS_CATALOG_VERSION,
+        available: false,
+        droppedCount: 0,
+        settings: [],
+        error: "The workspace path is invalid.",
+      },
+    };
+  }
   const executable = await dependencies.resolveExecutable();
-  const current = await loadCatalog(executable, dependencies);
+  const current = await loadCatalog(executable, dependencies, input.cwd);
   if (!executable || !current.available || !current.revision) {
     return {
       conflict: false,
@@ -229,8 +369,74 @@ export async function updateOmpSettingsWithDependencies(
   if (current.revision !== input.revision) {
     return { conflict: true, appliedPaths: [], catalog: current };
   }
-
   const byPath = new Map(current.settings.map((setting) => [setting.path, setting]));
+  if (input.cwd) {
+    for (const change of input.changes) {
+      const setting = byPath.get(change.path);
+      if (
+        !setting ||
+        setting.redacted ||
+        !["boolean", "number", "string", "enum"].includes(setting.type)
+      ) {
+        return {
+          conflict: false,
+          appliedPaths: [],
+          failed: {
+            path: change.path,
+            message: "This setting cannot be edited as a workspace scalar value.",
+          },
+          catalog: current,
+        };
+      }
+      if (change.operation === "set" && serializeScalar(setting.type, change.value) === null) {
+        return {
+          conflict: false,
+          appliedPaths: [],
+          failed: { path: change.path, message: `Expected a ${setting.type} value.` },
+          catalog: current,
+        };
+      }
+    }
+
+    const projectPath = join(input.cwd, ".omp", "config.yml");
+    const beforeValidation = await readProjectConfigText(projectPath);
+    const verified = await loadCatalog(executable, dependencies, input.cwd);
+    const afterValidation = await readProjectConfigText(projectPath);
+    if (verified.revision !== input.revision || beforeValidation !== afterValidation) {
+      return { conflict: true, appliedPaths: [], catalog: verified };
+    }
+    try {
+      const outcome = await writeProjectChanges(
+        input.cwd,
+        afterValidation,
+        input.changes,
+        executable,
+        dependencies,
+      );
+      if (outcome === "conflict") {
+        return {
+          conflict: true,
+          appliedPaths: [],
+          catalog: await loadCatalog(executable, dependencies, input.cwd),
+        };
+      }
+    } catch (error) {
+      return {
+        conflict: false,
+        appliedPaths: [],
+        failed: {
+          path: input.changes[0]?.path ?? "configuration",
+          message: error instanceof Error ? error.message : "Could not update workspace settings.",
+        },
+        catalog: await loadCatalog(executable, dependencies, input.cwd),
+      };
+    }
+    return {
+      conflict: false,
+      appliedPaths: input.changes.map((change) => change.path),
+      catalog: await loadCatalog(executable, dependencies, input.cwd),
+    };
+  }
   const appliedPaths: string[] = [];
   for (const change of input.changes) {
     const setting = byPath.get(change.path);
@@ -243,7 +449,7 @@ export async function updateOmpSettingsWithDependencies(
         conflict: false,
         appliedPaths,
         failed: { path: change.path, message: "This setting cannot be edited as a scalar value." },
-        catalog: await loadCatalog(executable, dependencies),
+        catalog: await loadCatalog(executable, dependencies, input.cwd),
       };
     }
     let args: string[] | null;
@@ -258,16 +464,18 @@ export async function updateOmpSettingsWithDependencies(
         conflict: false,
         appliedPaths,
         failed: { path: change.path, message: `Expected a ${setting.type} value.` },
-        catalog: appliedPaths.length ? await loadCatalog(executable, dependencies) : current,
+        catalog: appliedPaths.length
+          ? await loadCatalog(executable, dependencies, input.cwd)
+          : current,
       };
     }
-    const result = await dependencies.runConfig(executable, args);
+    const result = await dependencies.runConfig(executable, args, input.cwd);
     if (result.outcome !== "exited" || result.exitCode !== 0) {
       return {
         conflict: false,
         appliedPaths,
         failed: { path: change.path, message: "OMP rejected this setting change." },
-        catalog: await loadCatalog(executable, dependencies),
+        catalog: await loadCatalog(executable, dependencies, input.cwd),
       };
     }
     appliedPaths.push(change.path);
@@ -276,7 +484,7 @@ export async function updateOmpSettingsWithDependencies(
   return {
     conflict: false,
     appliedPaths,
-    catalog: await loadCatalog(executable, dependencies),
+    catalog: await loadCatalog(executable, dependencies, input.cwd),
   };
 }
 

package/server/paths.ts

@@ -1,18 +1,132 @@
-import { closeSync, constants, fstatSync, openSync, readSync } from "node:fs";
+import { AsyncLocalStorage } from "node:async_hooks";
+import { closeSync, constants, existsSync, fstatSync, openSync, readSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, resolve } from "node:path";
+import { isOmpProfileName, type OmpStore, OmpStoreSchema } from "../shared/omp-store";
 
 const MAX_SETTINGS_BYTES = 64 * 1024;
+const storeContext = new AsyncLocalStorage<OmpStore>();
+const ServerOmpStoreSchema = OmpStoreSchema.refine(
+  (store) => !store.agentDir || isAbsolute(store.agentDir),
+  "OMP agent directory must be absolute on the server platform",
+);
 
-/** Root of omp's per-machine agent state (`agent.db`, `history.db`, `memories/`). */
-export function ompAgentDir(environment: NodeJS.ProcessEnv = process.env): string {
+export function withOmpStore<T>(store: OmpStore | undefined, operation: () => T): T {
+  return storeContext.run(ServerOmpStoreSchema.parse(store ?? {}), operation);
+}
+
+/** Per-request selection, never process.env mutation: concurrent profiles stay isolated. */
+export function currentOmpEnvironment(source: NodeJS.ProcessEnv = process.env): NodeJS.ProcessEnv {
+  const store = storeContext.getStore();
+  if (!store?.profile && !store?.agentDir) return source;
+  const environment = { ...source };
+  for (const name of [
+    "PASEO_OMP_AGENT_DIR",
+    "OMP_AGENT_DIR",
+    "PI_CODING_AGENT_DIR",
+    "OMP_SESSION_DIR",
+    "PI_CODING_AGENT_SESSION_DIR",
+    "OMP_PROFILE",
+    "PI_PROFILE",
+    "PI_CONFIG_FILES",
+  ])
+    delete environment[name];
+  if (store.profile) environment.OMP_PROFILE = store.profile;
+  else if (store.agentDir) {
+    environment.PI_CODING_AGENT_DIR = store.agentDir;
+  }
+  return environment;
+}
+
+type OmpStorageKind = "data" | "state" | "cache";
+
+const XDG_HOME_BY_KIND: Record<OmpStorageKind, string> = {
+  data: "XDG_DATA_HOME",
+  state: "XDG_STATE_HOME",
+  cache: "XDG_CACHE_HOME",
+};
+
+function ompProfile(environment: NodeJS.ProcessEnv): string | undefined {
+  const raw =
+    environment.OMP_PROFILE !== undefined ? environment.OMP_PROFILE : environment.PI_PROFILE;
+  const profile = raw?.trim();
+  if (!profile || profile === "default") return;
+  if (!isOmpProfileName(profile)) throw new Error("Invalid OMP profile name");
+  return profile;
+}
+
+function defaultOmpAgentDir(environment: NodeJS.ProcessEnv, profile?: string): string {
   const home = environment.HOME ?? environment.USERPROFILE ?? homedir();
-  return (
-    environment.PASEO_OMP_AGENT_DIR ??
-    environment.OMP_AGENT_DIR ??
-    environment.PI_CODING_AGENT_DIR ??
-    join(home, environment.PI_CONFIG_DIR ?? ".omp", "agent")
-  );
+  return profile
+    ? join(home, environment.PI_CONFIG_DIR || ".omp", "profiles", profile, "agent")
+    : join(home, environment.PI_CONFIG_DIR || ".omp", "agent");
+}
+
+function explicitOmpAgentDir(
+  environment: NodeJS.ProcessEnv,
+  profile: string | undefined,
+): string | undefined {
+  const pluginOverride = environment.PASEO_OMP_AGENT_DIR ?? environment.OMP_AGENT_DIR;
+  if (pluginOverride) return pluginOverride;
+  // OMP deliberately ignores PI_CODING_AGENT_DIR while a named profile is active.
+  if (profile) return;
+  const override = environment.PI_CODING_AGENT_DIR;
+  const inheritedProfile = environment.PI_PROFILE?.trim();
+  // OMP_PROFILE=""/"default" overrides PI_PROFILE, including an agent path
+  // propagated by the parent profile. Such a path is not a custom default store.
+  if (
+    inheritedProfile &&
+    isOmpProfileName(inheritedProfile) &&
+    override === defaultOmpAgentDir(environment, inheritedProfile)
+  )
+    return;
+  return override ? resolve(override) : undefined;
+}
+
+/** OMP's configuration agent directory. Data/state/cache may use XDG-specific roots. */
+export function ompAgentDir(environment: NodeJS.ProcessEnv = currentOmpEnvironment()): string {
+  const profile = ompProfile(environment);
+  return explicitOmpAgentDir(environment, profile) ?? defaultOmpAgentDir(environment, profile);
+}
+
+function ompStorageDir(
+  kind: OmpStorageKind,
+  environment: NodeJS.ProcessEnv,
+  platform: NodeJS.Platform,
+): string {
+  const profile = ompProfile(environment);
+  const agentDir = ompAgentDir(environment);
+  if (
+    agentDir !== defaultOmpAgentDir(environment, profile) ||
+    (platform !== "linux" && platform !== "darwin")
+  ) {
+    return agentDir;
+  }
+  const xdgHome = environment[XDG_HOME_BY_KIND[kind]];
+  if (!xdgHome) return agentDir;
+  const root = profile ? join(xdgHome, "omp", "profiles", profile) : join(xdgHome, "omp");
+  return existsSync(root) ? root : agentDir;
+}
+
+export function ompDataDir(
+  environment: NodeJS.ProcessEnv = currentOmpEnvironment(),
+  platform: NodeJS.Platform = process.platform,
+): string {
+  return ompStorageDir("data", environment, platform);
+}
+
+export function ompCacheDir(
+  environment: NodeJS.ProcessEnv = currentOmpEnvironment(),
+  platform: NodeJS.Platform = process.platform,
+): string {
+  return ompStorageDir("cache", environment, platform);
+}
+
+export function ompStateDir(
+  environment: NodeJS.ProcessEnv = currentOmpEnvironment(),
+  platform: NodeJS.Platform = process.platform,
+): string {
+  return ompStorageDir("state", environment, platform);
 }
 
 function configuredSessionDir(agentDir: string): string | undefined {
@@ -56,9 +170,12 @@ function configuredSessionDir(agentDir: string): string | undefined {
 }
 
 /** OMP's effective session root, honoring its documented environment and settings precedence. */
-export function ompSessionDir(environment: NodeJS.ProcessEnv = process.env): string {
+export function ompSessionDir(
+  environment: NodeJS.ProcessEnv = currentOmpEnvironment(),
+  platform: NodeJS.Platform = process.platform,
+): string {
   const explicit = environment.OMP_SESSION_DIR ?? environment.PI_CODING_AGENT_SESSION_DIR;
   if (explicit) return resolve(explicit);
   const agentDir = ompAgentDir(environment);
-  return configuredSessionDir(agentDir) ?? join(agentDir, "sessions");
+  return configuredSessionDir(agentDir) ?? join(ompDataDir(environment, platform), "sessions");
 }

package/server/provider/catalog.ts

@@ -18,7 +18,7 @@ export const OMP_MODES: readonly ProviderMode[] = [
   {
     id: "full",
     label: "Full Access",
-    description: "Launches OMP with yolo approval mode so tools run without prompts.",
+    description: "Runs all tools without approval prompts.",
     icon: "ShieldOff",
     colorTier: "dangerous",
     isUnattended: true,
@@ -26,15 +26,14 @@ export const OMP_MODES: readonly ProviderMode[] = [
   {
     id: "write",
     label: "Write Approval",
-    description:
-      "Launches OMP with write approval mode; reads are free and writes require approval.",
+    description: "Runs reads without approval; writes require approval.",
     icon: "ShieldAlert",
     colorTier: "moderate",
   },
   {
     id: "ask",
     label: "Always Ask",
-    description: "Launches OMP with always-ask approval mode for write and exec tools.",
+    description: "Requires approval for write and execution tools.",
     icon: "ShieldCheck",
     colorTier: "safe",
   },