Commit 44ee7a6

Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork so the scope key matches what the client sends in activity lease scopes, while keeping the normalized path for filesystem operations. - Disconnect never clears leases: Add removeSession to BackgroundPolicy and call it in the WebSocket disconnect handler so activity leases are cleaned up immediately when a client disconnects rather than waiting for TTL expiry. - Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change the shared policy Select to update baseProfile while keeping profile as 'custom' and preserving existing overrides, instead of calling the preset helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6

9 files changed

Lines changed: 42 additions & 4 deletions

File tree

‎apps/server/src/background/BackgroundPolicy.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
reportClientActivity,
266278
removeRpcClient,
279+
removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
snapshot,
269282
streamChanges: Stream.fromPubSub(changes),

‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {

‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {

‎apps/server/src/provider/makeManagedServerProvider.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {

‎apps/server/src/server.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {

‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {

‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,

‎apps/server/src/ws.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({

‎apps/web/src/components/settings/SettingsPanels.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 44ee7a6
Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork
so the scope key matches what the client sends in activity lease scopes,
while keeping the normalized path for filesystem operations.
- Disconnect never clears leases: Add removeSession to BackgroundPolicy and
call it in the WebSocket disconnect handler so activity leases are cleaned
up immediately when a client disconnects rather than waiting for TTL expiry.
- Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change
the shared policy Select to update baseProfile while keeping profile as
'custom' and preserving existing overrides, instead of calling the preset
helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6
9 files changed
Lines changed: 42 additions & 4 deletions
File tree
‎apps/server/src/background/BackgroundPolicy.ts‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
 reportClientActivity,
266278
 removeRpcClient,
279+
 removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
 snapshot,
269282
streamChanges: Stream.fromPubSub(changes),
‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {
‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {
‎apps/server/src/provider/makeManagedServerProvider.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {
‎apps/server/src/server.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
 cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,
‎apps/server/src/ws.ts‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({
‎apps/web/src/components/settings/SettingsPanels.tsx‎
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 44ee7a6
Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork
so the scope key matches what the client sends in activity lease scopes,
while keeping the normalized path for filesystem operations.
- Disconnect never clears leases: Add removeSession to BackgroundPolicy and
call it in the WebSocket disconnect handler so activity leases are cleaned
up immediately when a client disconnects rather than waiting for TTL expiry.
- Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change
the shared policy Select to update baseProfile while keeping profile as
'custom' and preserving existing overrides, instead of calling the preset
helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6
9 files changed
Lines changed: 42 additions & 4 deletions
File tree
‎apps/server/src/background/BackgroundPolicy.ts‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
 reportClientActivity,
266278
 removeRpcClient,
279+
 removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
 snapshot,
269282
streamChanges: Stream.fromPubSub(changes),
‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {
‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {
‎apps/server/src/provider/makeManagedServerProvider.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {
‎apps/server/src/server.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
 cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,
‎apps/server/src/ws.ts‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({
‎apps/web/src/components/settings/SettingsPanels.tsx‎
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 44ee7a6
Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork
so the scope key matches what the client sends in activity lease scopes,
while keeping the normalized path for filesystem operations.
- Disconnect never clears leases: Add removeSession to BackgroundPolicy and
call it in the WebSocket disconnect handler so activity leases are cleaned
up immediately when a client disconnects rather than waiting for TTL expiry.
- Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change
the shared policy Select to update baseProfile while keeping profile as
'custom' and preserving existing overrides, instead of calling the preset
helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6
9 files changed
Lines changed: 42 additions & 4 deletions
File tree
‎apps/server/src/background/BackgroundPolicy.ts‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
 reportClientActivity,
266278
 removeRpcClient,
279+
 removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
 snapshot,
269282
streamChanges: Stream.fromPubSub(changes),
‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {
‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {
‎apps/server/src/provider/makeManagedServerProvider.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {
‎apps/server/src/server.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
 cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,
‎apps/server/src/ws.ts‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({
‎apps/web/src/components/settings/SettingsPanels.tsx‎
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 44ee7a6
Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork
so the scope key matches what the client sends in activity lease scopes,
while keeping the normalized path for filesystem operations.
- Disconnect never clears leases: Add removeSession to BackgroundPolicy and
call it in the WebSocket disconnect handler so activity leases are cleaned
up immediately when a client disconnects rather than waiting for TTL expiry.
- Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change
the shared policy Select to update baseProfile while keeping profile as
'custom' and preserving existing overrides, instead of calling the preset
helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6
9 files changed
Lines changed: 42 additions & 4 deletions
File tree
‎apps/server/src/background/BackgroundPolicy.ts‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
 reportClientActivity,
266278
 removeRpcClient,
279+
 removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
 snapshot,
269282
streamChanges: Stream.fromPubSub(changes),
‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {
‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {
‎apps/server/src/provider/makeManagedServerProvider.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {
‎apps/server/src/server.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
 cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,
‎apps/server/src/ws.ts‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({
‎apps/web/src/components/settings/SettingsPanels.tsx‎
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 44ee7a6
Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork
so the scope key matches what the client sends in activity lease scopes,
while keeping the normalized path for filesystem operations.
- Disconnect never clears leases: Add removeSession to BackgroundPolicy and
call it in the WebSocket disconnect handler so activity leases are cleaned
up immediately when a client disconnects rather than waiting for TTL expiry.
- Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change
the shared policy Select to update baseProfile while keeping profile as
'custom' and preserving existing overrides, instead of calling the preset
helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6
9 files changed
Lines changed: 42 additions & 4 deletions
File tree
‎apps/server/src/background/BackgroundPolicy.ts‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
 reportClientActivity,
266278
 removeRpcClient,
279+
 removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
 snapshot,
269282
streamChanges: Stream.fromPubSub(changes),
‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {
‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {
‎apps/server/src/provider/makeManagedServerProvider.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {
‎apps/server/src/server.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
 cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,
‎apps/server/src/ws.ts‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({
‎apps/web/src/components/settings/SettingsPanels.tsx‎
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 44ee7a6
Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork
so the scope key matches what the client sends in activity lease scopes,
while keeping the normalized path for filesystem operations.
- Disconnect never clears leases: Add removeSession to BackgroundPolicy and
call it in the WebSocket disconnect handler so activity leases are cleaned
up immediately when a client disconnects rather than waiting for TTL expiry.
- Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change
the shared policy Select to update baseProfile while keeping profile as
'custom' and preserving existing overrides, instead of calling the preset
helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6
9 files changed
Lines changed: 42 additions & 4 deletions
File tree
‎apps/server/src/background/BackgroundPolicy.ts‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
 reportClientActivity,
266278
 removeRpcClient,
279+
 removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
 snapshot,
269282
streamChanges: Stream.fromPubSub(changes),
‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {
‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {
‎apps/server/src/provider/makeManagedServerProvider.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {
‎apps/server/src/server.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
 cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,
‎apps/server/src/ws.ts‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({
‎apps/web/src/components/settings/SettingsPanels.tsx‎
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 44ee7a6
Browse files
cursoragentcursoragent
committed
fix: resolve background activity bugs (scope mismatch, leak on disconnect, dialog reset)
- VCS scope cwd mismatch: Pass raw (un-normalized) cwd to shouldRunScopeWork
so the scope key matches what the client sends in activity lease scopes,
while keeping the normalized path for filesystem operations.
- Disconnect never clears leases: Add removeSession to BackgroundPolicy and
call it in the WebSocket disconnect handler so activity leases are cleaned
up immediately when a client disconnects rather than waiting for TTL expiry.
- Advanced dialog clears overrides: In BackgroundActivityAdvancedDialog, change
the shared policy Select to update baseProfile while keeping profile as
'custom' and preserving existing overrides, instead of calling the preset
helper that wipes overrides.
1 parent 79ad071 commit 44ee7a6
9 files changed
Lines changed: 42 additions & 4 deletions
File tree
‎apps/server/src/background/BackgroundPolicy.ts‎
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface BackgroundPolicyShape {
3030
input: ClientActivityReportInput,
3131
)=>Effect.Effect<void>;
3232
readonlyremoveRpcClient: (rpcClientId: RpcClientId)=>Effect.Effect<void>;
33+
readonlyremoveSession: (sessionId: AuthSessionId)=>Effect.Effect<void>;
3334
readonlyreportHostPowerState: (snapshot: HostPowerSnapshot)=>Effect.Effect<void>;
3435
readonlysnapshot: Effect.Effect<BackgroundPolicySnapshot>;
3536
readonlystreamChanges: Stream.Stream<BackgroundPolicySnapshot>;
@@ -218,6 +219,17 @@ export const make = Effect.fn("background.policy.make")(function* () {
218219
returnnext;
219220
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
220221

222+
constremoveSession: BackgroundPolicyShape["removeSession"]=(sessionId)=>
223+
Ref.update(leasesRef,(leases)=>{
224+
constnext=newMap(leases);
225+
for(const[key,lease]ofnext){
226+
if(lease.sessionId===sessionId){
227+
next.delete(key);
228+
}
229+
}
230+
returnnext;
231+
}).pipe(Effect.andThen(publishSnapshot),Effect.asVoid);
232+
221233
consthasDemand: BackgroundPolicyShape["hasDemand"]=(scope)=>
222234
Effect.map(snapshot,(current)=>current.activeScopeKeys.includes(scopeKey(scope)));
223235

@@ -264,6 +276,7 @@ export const make = Effect.fn("background.policy.make")(function* () {
264276
returnBackgroundPolicy.of({
265277
 reportClientActivity,
266278
 removeRpcClient,
279+
 removeSession,
267280
reportHostPowerState: hostPowerMonitor.report,
268281
 snapshot,
269282
streamChanges: Stream.fromPubSub(changes),
‎apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
6464
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
6565
reportClientActivity: ()=>Effect.void,
6666
removeRpcClient: ()=>Effect.void,
67+
removeSession: ()=>Effect.void,
6768
reportHostPowerState: ()=>Effect.void,
6869
snapshot: Effect.succeed({
6970
hostPower: {
‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const TestHttpClientLive = Layer.succeed(
7878
constBackgroundPolicyAlwaysRunLayer=Layer.mock(BackgroundPolicy.BackgroundPolicy)({
7979
reportClientActivity: ()=>Effect.void,
8080
removeRpcClient: ()=>Effect.void,
81+
removeSession: ()=>Effect.void,
8182
reportHostPowerState: ()=>Effect.void,
8283
snapshot: Effect.succeed({
8384
hostPower: {
‎apps/server/src/provider/makeManagedServerProvider.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: boolean) {
9797
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9898
reportClientActivity: ()=>Effect.void,
9999
removeRpcClient: ()=>Effect.void,
100+
removeSession: ()=>Effect.void,
100101
reportHostPowerState: ()=>Effect.void,
101102
snapshot: Effect.succeed({
102103
hostPower: {
‎apps/server/src/server.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,7 @@ const buildAppUnderTest = (options?: {
777777
Layer.mock(BackgroundPolicy.BackgroundPolicy)({
778778
reportClientActivity: ()=>Effect.void,
779779
removeRpcClient: ()=>Effect.void,
780+
removeSession: ()=>Effect.void,
780781
reportHostPowerState: ()=>Effect.void,
781782
snapshot: Effect.succeed({
782783
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.test.ts‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ function makeBackgroundPolicyLayer(shouldRunScopeWork: (scope: BackgroundScope)
9292
returnLayer.mock(BackgroundPolicy.BackgroundPolicy)({
9393
reportClientActivity: ()=>Effect.void,
9494
removeRpcClient: ()=>Effect.void,
95+
removeSession: ()=>Effect.void,
9596
reportHostPowerState: ()=>Effect.void,
9697
snapshot: Effect.succeed({
9798
hostPower: {
‎apps/server/src/vcs/VcsStatusBroadcaster.ts‎
Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ export const layer = Layer.effect(
258258

259259
constmakeRemoteRefreshLoop=(
260260
cwd: string,
261+
scopeCwd: string,
261262
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
262263
refreshImmediately: boolean,
263264
)=>{
@@ -274,7 +275,7 @@ export const layer = Layer.effect(
274275

275276
constshouldRun=yield*backgroundPolicy.shouldRunScopeWork({
276277
type: "vcs-status",
277-
 cwd,
278+
cwd: scopeCwd,
278279
});
279280
if(!shouldRun){
280281
returnactiveInterval;
@@ -322,6 +323,7 @@ export const layer = Layer.effect(
322323

323324
constretainRemotePoller=Effect.fn("VcsStatusBroadcaster.retainRemotePoller")(function*(
324325
cwd: string,
326+
scopeCwd: string,
325327
automaticRemoteRefreshInterval: Effect.Effect<Duration.Duration,never>,
326328
refreshImmediately: boolean,
327329
){
@@ -336,7 +338,12 @@ export const layer = Layer.effect(
336338
returnEffect.succeed([undefined,nextPollers]asconst);
337339
}
338340

339-
returnmakeRemoteRefreshLoop(cwd,automaticRemoteRefreshInterval,refreshImmediately).pipe(
341+
returnmakeRemoteRefreshLoop(
342+
cwd,
343+
scopeCwd,
344+
automaticRemoteRefreshInterval,
345+
refreshImmediately,
346+
).pipe(
340347
Effect.forkIn(broadcasterScope),
341348
Effect.map((fiber)=>{
342349
constnextPollers=newMap(activePollers);
@@ -388,6 +395,7 @@ export const layer = Layer.effect(
388395
constinitialRemote=cachedStatus?.remote?.value??null;
389396
yield*retainRemotePoller(
390397
cwd,
398+
input.cwd,
391399
options?.automaticRemoteRefreshInterval??
392400
Effect.succeed(DEFAULT_VCS_STATUS_REFRESH_INTERVAL),
393401
cachedStatus?.remote===null||cachedStatus?.remote===undefined,
‎apps/server/src/ws.ts‎
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1669,6 +1669,7 @@ export const websocketRpcRouteLayer = Layer.unwrap(
16691669
constrequest=yield*HttpServerRequest.HttpServerRequest;
16701670
constserverAuth=yield*EnvironmentAuth.EnvironmentAuth;
16711671
constsessions=yield*SessionStore.SessionStore;
1672+
constbackgroundPolicy=yield*BackgroundPolicy.BackgroundPolicy;
16721673
constsession=yield*serverAuth.authenticateWebSocketUpgrade(request).pipe(
16731674
Effect.catchTags({
16741675
ServerAuthInvalidCredentialError: (error)=>failEnvironmentAuthInvalid(error.reason),
@@ -1710,7 +1711,11 @@ export const websocketRpcRouteLayer = Layer.unwrap(
17101711
returnyield*Effect.acquireUseRelease(
17111712
sessions.markConnected(session.sessionId),
17121713
()=>rpcWebSocketHttpEffect,
1713-
()=>sessions.markDisconnected(session.sessionId),
1714+
()=>
1715+
Effect.all([
1716+
sessions.markDisconnected(session.sessionId),
1717+
backgroundPolicy.removeSession(session.sessionId),
1718+
]).pipe(Effect.asVoid),
17141719
);
17151720
}).pipe(
17161721
Effect.catchTags({
‎apps/web/src/components/settings/SettingsPanels.tsx‎
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,14 @@ function BackgroundActivityAdvancedDialog({
680680
value==="performance"||
681681
value==="battery-saver"
682682
){
683-
updateSettings(backgroundActivityProfileSettings(value));
683+
updateSettings({
684+
backgroundActivity: {
685+
schemaVersion: 1asconst,
686+
profile: "custom"asconst,
687+
baseProfile: value,
688+
overrides: settings.backgroundActivity.overrides,
689+
},
690+
});
684691
}
685692
}}
686693
>
0 commit comments
Comments
 (0)