@spencer-kit/coder-studio 0.4.6 → 0.4.7

package/dist/esm/server-runner.mjs

@@ -12231,6 +12231,13 @@ var init_manager5 = __esm({
           ...derivedColorFgBg ? { COLORFGBG: derivedColorFgBg } : {},
           ...spec.env
         };
+        delete terminalEnv.COLORFGBG;
+        if (derivedColorFgBg) {
+          terminalEnv.COLORFGBG = derivedColorFgBg;
+        }
+        if (spec.env?.COLORFGBG) {
+          terminalEnv.COLORFGBG = spec.env.COLORFGBG;
+        }
         let pty;
         try {
           pty = this.deps.ptyHost.spawn(spec.argv, {
@@ -12630,7 +12637,7 @@ var init_update_service = __esm({
   "packages/server/src/update/update-service.ts"() {
     "use strict";
     init_src3();
-    UpdateService = class {
+    UpdateService = class _UpdateService {
       constructor(deps) {
         this.deps = deps;
         this.now = deps.now ?? Date.now;
@@ -12652,12 +12659,14 @@ var init_update_service = __esm({
         this.spawnDetachedWorkerImpl = deps.spawnDetachedWorker;
       }
       deps;
+      static CHECK_TIMEOUT_MS = 15e3;
       now;
       runtime;
       updateWorkerLogFilePath;
       runLatestVersionLookup;
       spawnDetachedWorkerImpl;
       scheduleTimer = null;
+      inFlightCheck = null;
       start() {
         this.reconcileOnStartup();
         this.reloadScheduleFromSettings();
@@ -12688,10 +12697,8 @@ var init_update_service = __esm({
         this.scheduleTimer.unref?.();
       }
       getStateView() {
-        return {
-          ...this.deps.updateStateRepo.get(),
-          ...this.getSupportInfo()
-        };
+        const persisted = this.deps.updateStateRepo.get();
+        return this.composeStateView(persisted);
       }
       getPrepareInstallState() {
         const state = this.getStateView();
@@ -12708,36 +12715,15 @@ var init_update_service = __esm({
         if (current.updateStatus === "installing" || current.updateStatus === "restarting") {
           throw createBusyError("Update installation is already in progress");
         }
-        if (current.updateStatus === "checking") {
+        if (this.inFlightCheck) {
           throw createBusyError("Update check is already in progress");
         }
-        this.persistAndBroadcast({
-          updateStatus: "checking",
-          finishedAt: null,
-          errorSummary: null
-        });
+        this.inFlightCheck = this.runCheckForUpdates();
+        this.broadcastStateChange();
         try {
-          const latestVersion = await this.runLatestVersionLookup(this.runtime.packageName);
-          const availability = compareVersions(latestVersion, this.runtime.currentVersion) > 0 ? "update_available" : "up_to_date";
-          return this.persistAndBroadcast({
-            currentVersion: this.runtime.currentVersion,
-            latestVersion,
-            availability,
-            updateStatus: "idle",
-            lastCheckedAt: this.now(),
-            errorSummary: null,
-            requiresManualStep: false,
-            manualCommand: null
-          });
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          return this.persistAndBroadcast({
-            currentVersion: this.runtime.currentVersion,
-            availability: "check_failed",
-            updateStatus: "idle",
-            lastCheckedAt: this.now(),
-            errorSummary: message
-          });
+          return await this.inFlightCheck;
+        } finally {
+          this.inFlightCheck = null;
         }
       }
       prepareInstall() {
@@ -12752,6 +12738,9 @@ var init_update_service = __esm({
         if (state.updateStatus === "installing" || state.updateStatus === "restarting") {
           throw createBusyError("Update installation is already in progress");
         }
+        if (this.inFlightCheck) {
+          throw createBusyError("Update check is already in progress");
+        }
         const targetVersion = input.targetVersion ?? state.latestVersion;
         if (!targetVersion) {
           throw createValidationError("update_no_target", "No target version is available");
@@ -12826,6 +12815,15 @@ var init_update_service = __esm({
             errorSummary: null
           });
         }
+        if (current.updateStatus === "checking") {
+          return this.persistAndBroadcast({
+            currentVersion: this.runtime.currentVersion,
+            availability: "check_failed",
+            updateStatus: "failed",
+            finishedAt: this.now(),
+            errorSummary: "Update check did not complete before the service restarted"
+          });
+        }
         if (current.updateStatus === "installing" || current.updateStatus === "restarting") {
           return this.persistAndBroadcast({
             currentVersion: this.runtime.currentVersion,
@@ -12876,18 +12874,6 @@ var init_update_service = __esm({
           hasActiveWork: runningTerminalCount > 0 || runningSessionCount > 0 || runningSupervisorCount > 0
         };
       }
-      persistAndBroadcast(patch) {
-        const snapshot = this.deps.updateStateRepo.update((current) => ({
-          ...patch,
-          currentVersion: patch.currentVersion ?? current.currentVersion
-        }));
-        const view = {
-          ...snapshot,
-          ...this.getSupportInfo()
-        };
-        this.deps.broadcaster.broadcast("update.state.changed", view);
-        return view;
-      }
       buildManualCommand(targetVersion) {
         return [
           `${this.runtime.npmCommand ?? "npm"} install -g ${this.runtime.packageName}@${targetVersion}`,
@@ -12917,6 +12903,83 @@ var init_update_service = __esm({
         });
         child.unref();
       }
+      composeStateView(snapshot, options) {
+        if (options?.includeInFlightCheck !== false && this.inFlightCheck) {
+          return {
+            ...snapshot,
+            ...this.getSupportInfo(),
+            updateStatus: "checking",
+            errorSummary: null
+          };
+        }
+        return {
+          ...snapshot,
+          ...this.getSupportInfo()
+        };
+      }
+      broadcastStateChange() {
+        this.deps.broadcaster.broadcast("update.state.changed", this.getStateView());
+      }
+      async runCheckForUpdates() {
+        try {
+          const latestVersion = await this.withCheckTimeout(
+            this.runLatestVersionLookup(this.runtime.packageName)
+          );
+          const availability = compareVersions(latestVersion, this.runtime.currentVersion) > 0 ? "update_available" : "up_to_date";
+          return this.persistAndBroadcast(
+            {
+              currentVersion: this.runtime.currentVersion,
+              latestVersion,
+              availability,
+              updateStatus: "idle",
+              lastCheckedAt: this.now(),
+              errorSummary: null,
+              requiresManualStep: false,
+              manualCommand: null
+            },
+            false
+          );
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          return this.persistAndBroadcast(
+            {
+              currentVersion: this.runtime.currentVersion,
+              availability: "check_failed",
+              updateStatus: "idle",
+              lastCheckedAt: this.now(),
+              errorSummary: message
+            },
+            false
+          );
+        }
+      }
+      async withCheckTimeout(promise) {
+        let timeoutHandle = null;
+        try {
+          return await Promise.race([
+            promise,
+            new Promise((_, reject) => {
+              timeoutHandle = setTimeout(() => {
+                reject(new Error(`Update check timed out after ${_UpdateService.CHECK_TIMEOUT_MS}ms`));
+              }, _UpdateService.CHECK_TIMEOUT_MS);
+              timeoutHandle.unref?.();
+            })
+          ]);
+        } finally {
+          if (timeoutHandle) {
+            clearTimeout(timeoutHandle);
+          }
+        }
+      }
+      persistAndBroadcast(patch, includeInFlightCheck = true) {
+        const snapshot = this.deps.updateStateRepo.update((current) => ({
+          ...patch,
+          currentVersion: patch.currentVersion ?? current.currentVersion
+        }));
+        const view = this.composeStateView(snapshot, { includeInFlightCheck });
+        this.deps.broadcaster.broadcast("update.state.changed", view);
+        return view;
+      }
     };
   }
 });