@oar-sh/oar 0.9.7 → 0.9.8

package/server/services/session-worker-registry-service.mjs

@@ -82,6 +82,19 @@ function normalizeSteeringCancellableIds(raw) {
   return ids;
 }
 
+// The Claude worker's running CLI: the compaction window it was spawned with
+// (a token count, null = Auto) and whether background work holds it, which
+// blocks the respawn that applies a changed window. Null when no CLI runs or
+// the worker does not report it.
+function normalizeSteeringAutoCompactWindow(raw) {
+  if (!raw || typeof raw !== 'object') return null;
+  const active = Number(raw.active);
+  return {
+    active: Number.isFinite(active) && active > 0 ? Math.round(active) : null,
+    backgroundWork: raw.backgroundWork === true,
+  };
+}
+
 // The worker's composer-facing steering snapshot, published on its heartbeat.
 // Callers follow the registry convention of spreading the existing entry into
 // upserts, so an update without `steering` keeps the last known snapshot.
@@ -98,7 +111,7 @@ export function normalizeWorkerSteeringSnapshot(raw) {
   if (!raw || typeof raw !== 'object') return null;
   const holdReason = String(raw.holdReason || '').trim().toLowerCase();
   const messageId = String(raw.messageId || '').trim().slice(0, STEERING_MESSAGE_ID_MAX_LENGTH);
-  return {
+  const snapshot = {
     turnActive: raw.turnActive === true,
     canSteer: raw.canSteer === true,
     holdReason: STEERING_HOLD_REASONS.has(holdReason) ? holdReason : null,
@@ -106,6 +119,10 @@ export function normalizeWorkerSteeringSnapshot(raw) {
     supported: raw.supported === true,
     cancellableIds: normalizeSteeringCancellableIds(raw.cancellableIds),
   };
+  // Only a snapshot that reports a running CLI carries the key.
+  const autoCompactWindow = normalizeSteeringAutoCompactWindow(raw.autoCompactWindow);
+  if (autoCompactWindow) snapshot.autoCompactWindow = autoCompactWindow;
+  return snapshot;
 }
 
 function sanitizeState(raw = null) {

package/server/services/update-install-service.mjs

@@ -1,6 +1,7 @@
 'use strict';
 
 import { spawn as defaultSpawn } from 'child_process';
+import fs from 'fs';
 
 import {
   CLI_SPAWN_DISABLED_ERROR,
@@ -10,6 +11,7 @@ import {
   stripTerminalEscapes,
   tailOf,
 } from './cli-process-runner.mjs';
+import { NPM_ALLOW_SCRIPTS_ARG, resolveNpmInvocation } from './oar-cli-helpers.mjs';
 import { compareSemverIsh, parseSemverIsh } from '../../shared/update-semver.mjs';
 
 // Applies an OAR self-update: `npm i -g @oar-sh/oar@<version>` with the log
@@ -99,6 +101,9 @@ export function readUpdateOutcome(readSetting) {
 export function createUpdateInstallService({
   runningVersion,
   installMethod = 'npm-global',
+  packageRoot = '',
+  execPath = process.execPath,
+  existsImpl = fs.existsSync,
   spawnImpl = defaultSpawn,
   env = process.env,
   platform = process.platform,
@@ -204,12 +209,13 @@ export function createUpdateInstallService({
 
     // npm itself is a shim on Windows; spawn npm.cmd through a shell there
     // (args are fixed strings + a validated semver, so no injection surface).
-    const command = platform === 'win32' ? 'npm.cmd' : 'npm';
-    const args = ['install', '-g', `${UPDATE_PACKAGE_NAME}@${target}`];
+    const npm = resolveNpmInvocation({ execPath, packageRoot, platform, env, existsImpl });
+    const command = npm.command;
+    const args = ['install', '-g', ...npm.prefixArgs, NPM_ALLOW_SCRIPTS_ARG, `${UPDATE_PACKAGE_NAME}@${target}`];
     const result = await runToCompletion(
       () => spawnImpl(command, args, {
         stdio: ['ignore', 'pipe', 'pipe'],
-        env: { ...env },
+        env: npm.env,
         ...(platform === 'win32' ? { windowsHide: true, shell: true } : { detached: true }),
       }),
       {