Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

fix(web): Remove saved environments atomically (#2917)

Mike Olson1fcc57af136e
diff --git a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
index 3456d7b7f..abf8394cd 100644
--- a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
+++ b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
@@ -272,6 +272,26 @@ describe("DesktopSavedEnvironments", () => {
),
);
+ it.effect("removes saved environment metadata and its embedded secret atomically", () =>
+ withSavedEnvironments(
+ Effect.gen(function* () {
+ const savedEnvironments = yield* DesktopSavedEnvironments.DesktopSavedEnvironments;
+ yield* savedEnvironments.setRegistry([savedRegistryRecord]);
+ yield* savedEnvironments.setSecret({
+ environmentId: savedRegistryRecord.environmentId,
+ secret: "bearer-token",
+ });
+
+ yield* savedEnvironments.removeEnvironment(savedRegistryRecord.environmentId);
+
+ assert.deepEqual(yield* savedEnvironments.getRegistry, []);
+ assert.isTrue(
+ Option.isNone(yield* savedEnvironments.getSecret(savedRegistryRecord.environmentId)),
+ );
+ }),
+ ),
+ );
+
it.effect("treats empty saved environment documents as empty", () =>
withSavedEnvironments(
Effect.gen(function* () {
diff --git a/apps/desktop/src/settings/DesktopSavedEnvironments.ts b/apps/desktop/src/settings/DesktopSavedEnvironments.ts
index 137a9a31d..195992f04 100644
--- a/apps/desktop/src/settings/DesktopSavedEnvironments.ts
+++ b/apps/desktop/src/settings/DesktopSavedEnvironments.ts
@@ -121,6 +121,9 @@ export interface DesktopSavedEnvironmentsShape {
readonly setRegistry: (
records: readonly PersistedSavedEnvironmentRecord[],
) => Effect.Effect<void, DesktopSavedEnvironmentsWriteError>;
+ readonly removeEnvironment: (
+ environmentId: string,
+ ) => Effect.Effect<void, DesktopSavedEnvironmentsWriteError>;
readonly getSecret: (
environmentId: string,
) => Effect.Effect<Option.Option<string>, DesktopSavedEnvironmentsGetSecretError>;
@@ -293,6 +296,23 @@ export const layer = Layer.effect(
).pipe(Effect.mapError((cause) => new DesktopSavedEnvironmentsWriteError({ cause })));
yield* writeDocument(preserveExistingSecrets(currentDocument, records));
}),
+ removeEnvironment: Effect.fn("desktop.savedEnvironments.removeEnvironment")(
+ function* (environmentId) {
+ yield* Effect.annotateCurrentSpan({ environmentId });
+ const document = yield* readRegistryDocument(
+ fileSystem,
+ environment.savedEnvironmentRegistryPath,
+ ).pipe(Effect.mapError((cause) => new DesktopSavedEnvironmentsWriteError({ cause })));
+ if (!document.records.some((record) => record.environmentId === environmentId)) {
+ return;
+ }
+
+ yield* writeDocument({
+ version: document.version,
+ records: document.records.filter((record) => record.environmentId !== environmentId),
+ });
+ },
+ ),
getSecret: Effect.fn("desktop.savedEnvironments.getSecret")(function* (environmentId) {
yield* Effect.annotateCurrentSpan({ environmentId });
const document = yield* readRegistryDocument(
@@ -385,6 +405,18 @@ export const layerTest = (input?: {
return DesktopSavedEnvironments.of({
getRegistry: Ref.get(recordsRef),
setRegistry: (records) => Ref.set(recordsRef, records),
+ removeEnvironment: (environmentId) =>
+ Ref.update(recordsRef, (records) =>
+ records.filter((record) => record.environmentId !== environmentId),
+ ).pipe(
+ Effect.andThen(
+ Ref.update(secretsRef, (secrets) => {
+ const nextSecrets = new Map(secrets);
+ nextSecrets.delete(environmentId);
+ return nextSecrets;
+ }),
+ ),
+ ),
getSecret: (environmentId) =>
Ref.get(secretsRef).pipe(
Effect.map((secrets) => Option.fromNullishOr(secrets.get(environmentId))),