@omercnet/paseo-omp 5.1.1-next.350.1 → 5.1.1-next.355.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omercnet/paseo-omp",
-  "version": "5.1.1-next.350.1",
+  "version": "5.1.1-next.355.1",
   "type": "module",
   "description": "Paseo integration for OMP, including its direct provider and workspace tooling.",
   "license": "MIT",
@@ -77,7 +77,7 @@
     "tsx": "^4.20.6",
     "typescript": "^7.0.2",
     "vitest": "^5.0.0",
-    "zod": "4.4.3"
+    "zod": "4.6.6"
   },
   "overrides": {
     "qs": "6.16.1"

package/scripts/prepare-dependencies.mjs

@@ -1,9 +1,11 @@
-import { execFileSync } from "node:child_process";
+import { execSync } from "node:child_process";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 
 const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+// Run through the shell so Windows resolves npm.cmd: Node refuses to spawn .cmd files without one.
+const INSTALL_COMMAND = "npm ci --omit=dev --ignore-scripts --workspaces=false";
 
 function loadRootCatalog(root) {
   for (let directory = root; ; directory = dirname(directory)) {
@@ -27,6 +29,8 @@ function stageManifest(root, catalog, install) {
     manifest.dependencies[name] = catalog[name];
   }
   delete manifest.devDependencies;
+  // npm-shrinkwrap.json is generated without overrides, so npm ci rejects a manifest that keeps them.
+  delete manifest.overrides;
 
   writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
   try {
@@ -36,18 +40,11 @@ function stageManifest(root, catalog, install) {
   }
 }
 
-export function prepareDependencies(root = projectRoot, execute = execFileSync) {
+export function prepareDependencies(root = projectRoot, execute = execSync) {
   const catalog = loadRootCatalog(root);
   if (!catalog) return false;
   stageManifest(root, catalog, () => {
-    execute(
-      process.platform === "win32" ? "npm.cmd" : "npm",
-      ["ci", "--omit=dev", "--ignore-scripts", "--workspaces=false"],
-      {
-        cwd: root,
-        stdio: "inherit",
-      },
-    );
+    execute(INSTALL_COMMAND, { cwd: root, stdio: "inherit" });
   });
   return true;
 }

package/server/package-version.ts

@@ -1,2 +1,2 @@
 /** Release Please keeps this bundle-safe constant aligned with package.json. */
-export const PASEO_OMP_PACKAGE_VERSION = "5.1.1-next.350.1"; // x-release-please-version
+export const PASEO_OMP_PACKAGE_VERSION = "5.1.1-next.355.1"; // x-release-please-version

package/server/provider/connection.ts

@@ -893,6 +893,7 @@ export function createOmpConnection(
                 query: input.query,
                 limit: input.limit,
                 sessionDir: listingConfig.sessionDir,
+                signal: shutdown.signal,
               })
             ).map((session) => ({
               persistence: { version: 1, data: { sessionId: session.id } },
@@ -997,6 +998,7 @@ export function createOmpConnection(
                 environment,
                 hostInheritEnv,
                 scheduler,
+                controller.signal,
               )
             : await OmpProviderSession.open(
                 input,

package/server/provider/omp-rpc-process.ts

@@ -64,12 +64,15 @@ export async function terminatePosixProcessTree(
 
 export type ProcessTreeCleanup = "verified" | "uncertain" | "failed";
 
-export async function stopWindowsTree(pid: number): Promise<ProcessTreeCleanup> {
+export async function stopWindowsTree(
+  pid: number,
+  spawnTaskkill: typeof spawn = spawn,
+): Promise<ProcessTreeCleanup> {
   const result = Promise.withResolvers<ProcessTreeCleanup>();
   const systemRoot = process.env.SystemRoot ?? WINDOWS_DEFAULT_SYSTEM_ROOT;
   let taskkill: ChildProcessWithoutNullStreams;
   try {
-    taskkill = spawn(
+    taskkill = spawnTaskkill(
       join(systemRoot, "System32", "taskkill.exe"),
       ["/PID", String(pid), "/T", "/F"],
       {
@@ -99,13 +102,10 @@ export async function stopWindowsTree(pid: number): Promise<ProcessTreeCleanup>
   }, PROCESS_STOP_TIMEOUT_MS);
   taskkill.once("error", () => finish("failed"));
   taskkill.once("close", (code, signal) => {
-    finish(
-      code === 0 && signal === null
-        ? "verified"
-        : code === 128 && signal === null
-          ? "uncertain"
-          : "failed",
-    );
+    // 128 means taskkill found no such process because it already exited; retrying only repeats
+    // 128. Callers still wait for the root OMP process's own exit, so a live root cannot pass.
+    // Descendants of an already exited root cannot be enumerated by taskkill and are not checked.
+    finish((code === 0 || code === 128) && signal === null ? "verified" : "failed");
   });
   return result.promise;
 }

package/server/provider/registration.ts

@@ -118,6 +118,7 @@ export interface OmpProviderOptions {
   timelineScheduler?: OmpTimelineScheduler;
   replayTimeoutMs?: number;
   environment?: NodeJS.ProcessEnv;
+  platform?: NodeJS.Platform;
   /** Fixed, non-secret profile/store identity for providers whose configuration is server-owned. */
   catalogIdentity?: Readonly<Record<string, string>>;
   mcpInitializationTimeoutMs?: number;
@@ -156,6 +157,7 @@ export function createOmpProvider(options: OmpProviderOptions = {}): ProviderReg
     });
   const nativeReservations = new OmpNativeSessionReservations();
   const sessionLimit = options.sessionLimit ?? new OmpSessionLimit();
+  const platform = options.platform ?? process.platform;
   const checkAvailability: NonNullable<ProviderRegistrationCompat["checkAvailability"]> = async (
     catalogOptions,
     context,
@@ -165,6 +167,12 @@ export function createOmpProvider(options: OmpProviderOptions = {}): ProviderReg
     }
     const providerOptions = parseOmpProviderOptions(catalogOptions.providerOptions);
     const environment = { ...(options.environment ?? process.env), ...providerOptions.env };
+    // Windows env names are case-insensitive, but a copy keeps only the literal key (often
+    // `Path`), so `environment.PATH` would miss it and OMP would look not installed.
+    if (platform === "win32" && environment.PATH === undefined) {
+      const pathKey = Object.keys(environment).find((name) => name.toUpperCase() === "PATH");
+      if (pathKey !== undefined) environment.PATH = environment[pathKey];
+    }
     const configuredCommand: readonly [string, ...string[]] = providerOptions.command?.[0]
       ? [providerOptions.command[0], ...providerOptions.command.slice(1)]
       : [environment.OMP_COMMAND || "omp"];
@@ -173,6 +181,7 @@ export function createOmpProvider(options: OmpProviderOptions = {}): ProviderReg
       cwd:
         catalogOptions.scope === "workspace" && catalogOptions.cwd ? catalogOptions.cwd : homedir(),
       environment,
+      platform,
       timeoutMs: context?.timeoutMs,
     });
   };

package/server/provider/session-descriptors.ts

@@ -10,12 +10,11 @@ const MAX_DESCRIPTOR_PREFIX_BYTES = 64 * 1024;
 const MAX_DESCRIPTOR_SUFFIX_BYTES = 64 * 1024;
 const MAX_PROMPT_PREVIEW_CHARS = 160;
 const MAX_DIRECTORY_DEPTH = 8;
-// Count caps only bound memory; the byte and time budgets bound scan work. OMP keeps one
-// directory per workspace, so these must exceed real session trees or lookups silently miss.
+// No wall-clock cutoff: it silently drops sessions on a slow disk. OMP keeps one directory per
+// workspace, so the count caps must exceed real session trees or lookups silently miss.
 const MAX_SCAN_DIRECTORIES = 65_536;
 const MAX_SCAN_FILES = 262_144;
 const MAX_SCAN_BYTES = 16 * 1024 * 1024;
-const MAX_SCAN_MS = 1_000;
 const SCAN_YIELD_INTERVAL = 128;
 const MAX_LIST_RESULTS = 500;
 const MAX_CHILD_TRANSCRIPT_BYTES = 16 * 1024 * 1024;
@@ -59,10 +58,10 @@ export interface OmpSessionListOptions {
   limit?: number;
   sessionId?: string;
   sessionDir?: string;
+  signal?: AbortSignal;
 }
 
 interface ScanBudget {
-  startedAt: number;
   directories: number;
   files: number;
   bytes: number;
@@ -155,8 +154,7 @@ function budgetExceeded(budget: ScanBudget): boolean {
     budget.exhausted ||
     budget.directories >= MAX_SCAN_DIRECTORIES ||
     budget.files >= MAX_SCAN_FILES ||
-    budget.bytes >= MAX_SCAN_BYTES ||
-    Date.now() - budget.startedAt >= MAX_SCAN_MS
+    budget.bytes >= MAX_SCAN_BYTES
   );
 }
 
@@ -418,11 +416,13 @@ async function scanSessionFiles(
   root: string,
   budget: ScanBudget,
   visit: (file: string) => Promise<boolean>,
+  signal?: AbortSignal,
 ): Promise<void> {
   const pending: Array<{ path: string; depth: number }> = [{ path: root, depth: 0 }];
   while (pending.length > 0 && !budgetExceeded(budget)) {
     const current = pending.pop();
     if (!current) return;
+    signal?.throwIfAborted();
     budget.directories += 1;
     let directory: Dir;
     try {
@@ -432,6 +432,7 @@ async function scanSessionFiles(
     }
     try {
       for await (const entry of directory) {
+        signal?.throwIfAborted();
         budget.entries += 1;
         if (budget.entries % SCAN_YIELD_INTERVAL === 0) await yieldToEventLoop();
         if (budgetExceeded(budget)) return;
@@ -469,7 +470,6 @@ export async function listOmpSessionDescriptors(
   const query = options.query?.trim().toLowerCase();
   const matches: OmpSessionDescriptor[] = [];
   const budget: ScanBudget = {
-    startedAt: Date.now(),
     directories: 0,
     files: 0,
     bytes: 0,
@@ -481,29 +481,35 @@ export async function listOmpSessionDescriptors(
       ? join(environment.HOME ?? environment.USERPROFILE ?? homedir(), options.sessionDir.slice(2))
       : resolve(options.cwd ?? homedir(), options.sessionDir)
     : ompSessionDir(environment);
-  await scanSessionFiles(root, budget, async (file) => {
-    const fileName = basename(file);
-    const stem = fileName.slice(0, -".jsonl".length);
-    if (requestedId && !stem.endsWith(`_${requestedId}`)) return true;
-    const descriptor = await parseDescriptor(file, budget);
-    if (
-      !descriptor ||
-      !stem.endsWith(`_${descriptor.id}`) ||
-      (options.cwd !== undefined && descriptor.cwd !== options.cwd)
-    )
-      return !budgetExceeded(budget);
-    if (
-      query &&
-      !descriptor.id.toLowerCase().includes(query) &&
-      !descriptor.title?.toLowerCase().includes(query) &&
-      !descriptor.firstPromptPreview?.toLowerCase().includes(query) &&
-      !descriptor.lastPromptPreview?.toLowerCase().includes(query)
-    ) {
-      return !budgetExceeded(budget);
-    }
-    retainNewest(matches, descriptor, retentionLimit);
-    return !requestedId || matches.length < 2;
-  });
+  await scanSessionFiles(
+    root,
+    budget,
+    async (file) => {
+      const fileName = basename(file);
+      const stem = fileName.slice(0, -".jsonl".length);
+      if (requestedId && !stem.endsWith(`_${requestedId}`)) return true;
+      const descriptor = await parseDescriptor(file, budget);
+      if (
+        !descriptor ||
+        !stem.endsWith(`_${descriptor.id}`) ||
+        (options.cwd !== undefined && descriptor.cwd !== options.cwd)
+      )
+        return !budgetExceeded(budget);
+      if (
+        query &&
+        !descriptor.id.toLowerCase().includes(query) &&
+        !descriptor.title?.toLowerCase().includes(query) &&
+        !descriptor.firstPromptPreview?.toLowerCase().includes(query) &&
+        !descriptor.lastPromptPreview?.toLowerCase().includes(query)
+      ) {
+        return !budgetExceeded(budget);
+      }
+      retainNewest(matches, descriptor, retentionLimit);
+      return !requestedId || matches.length < 2;
+    },
+    options.signal,
+  );
+  options.signal?.throwIfAborted();
   return matches;
 }
 

package/server/provider/session-history.ts

@@ -119,6 +119,7 @@ export class OmpHistorySession implements OmpOpenedSession {
     environment?: NodeJS.ProcessEnv,
     hostInheritEnv: readonly string[] = [],
     scheduler: OmpTimelineScheduler = defaultOmpTimelineScheduler,
+    signal?: AbortSignal,
   ): Promise<OmpHistorySession> {
     const nativeSessionId = ompPersistenceSessionId(input);
     if (!nativeSessionId || input.history !== "replay" || !input.config.persist) {
@@ -141,6 +142,7 @@ export class OmpHistorySession implements OmpOpenedSession {
       nativeSessionId,
       input.config.cwd,
       normalized.sessionDir,
+      signal,
     );
     if (!descriptor.transcriptFile) {
       throw new OmpPublicError("OMP session transcript could not be resolved in this workspace");

package/server/provider/session.ts

@@ -228,8 +228,9 @@ export async function authorizeNativeSession(
   sessionId: string,
   cwd: string,
   sessionDir?: string,
+  signal?: AbortSignal,
 ): Promise<OmpSessionDescriptor> {
-  const matches = await runtime.listSessions({ sessionId, cwd, limit: 2, sessionDir });
+  const matches = await runtime.listSessions({ sessionId, cwd, limit: 2, sessionDir, signal });
   const descriptor = matches[0];
   if (matches.length !== 1 || descriptor?.id !== sessionId) {
     throw new OmpPublicError("OMP session could not be resolved in this workspace");
@@ -542,6 +543,7 @@ export class OmpProviderSession implements OmpOpenedSession, OmpSubagentControls
           resumeSessionId,
           input.config.cwd,
           normalizedConfig.sessionDir,
+          signal,
         )
       : undefined;
     validateOmpHostToolConfig(effectiveConfig);