[codex] Refactor project and workspace Effect services - #3190

Merged
juliusmarminge merged 4 commits into
mainfrom
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged

[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom
codex/effect-service-server-workspace-project

Conversation

@juliusmarminge

@juliusmarmingejuliusmarminge commented Jun 20, 2026•
edited by macroscopeapp Bot
Loading

Copy link
Copy Markdown
Member

Summary

  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules

Scope

Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.

Validation

  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads

Note

Medium Risk
Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.

Overview
This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).

ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.

Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.

ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.

Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.

Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Refactor project and workspace services to use Context.Service tags and consolidated module paths

  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.

Macroscope summarized 8fd3f54.

@coderabbitai

coderabbitaiBot commented Jun 20, 2026•
edited
Loading

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/effect-service-server-workspace-project

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 1,000+ changed lines (additions + deletions). labels Jun 20, 2026
@juliusmarmingejuliusmarminge changed the title Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions

github-actionsBot commented Jun 20, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

🚀 Expo continuous deployment is ready!

  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR

macroscopeapp[bot]
macroscopeappBot reviewed Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge marked this pull request as ready for review June 20, 2026 02:06
@macroscopeapp

macroscopeappBot commented Jun 20, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.

You can customize Macroscope's approvability policy. Learn more.

@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch 2 times, most recently from 41c4584 to 467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch from 467c615 to 3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 20, 2026 03:10

Dismissing prior approval to re-evaluate 3278f2b

macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch from 3278f2b to 711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 20, 2026 03:32

Dismissing prior approval to re-evaluate 711d999

@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch 2 times, most recently from f67b906 to bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch from bd621c3 to 6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 20, 2026 04:35

Dismissing prior approval to re-evaluate 6cca072

@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch 2 times, most recently from ff916a0 to e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch from e4625d7 to 91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 20, 2026 05:06

Dismissing prior approval to re-evaluate 91d61c1

@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch 4 times, most recently from 678babb to bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch from bfe0f6d to 5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch 2 times, most recently from cb7b3f2 to 273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others added 4 commits June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed the codex/effect-service-server-workspace-project branch 2 times, most recently from 46dbceb to 8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 20, 2026 06:58

Dismissing prior approval to re-evaluate 8fd3f54

@juliusmarminge
juliusmarminge merged commit b0a3a50 into mainJun 20, 2026
16 checks passed
@juliusmarminge
juliusmarminge deleted the codex/effect-service-server-workspace-project branch June 20, 2026 07:12
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees

No one assigned

Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge
, '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
[codex] Refactor project and workspace Effect services - #3190
Merged
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged
[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Conversation
@juliusmarminge
@juliusmarmingejuliusmarminge
commented
Jun 20, 2026•

edited by macroscopeapp
Bot
Loading

Copy link


Copy Markdown

Member
Summary
  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules
Scope
Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.
Validation
  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads
Note
Medium Risk

Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.
Overview

This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).
ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.
Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.
ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.
Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.
Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Refactor project and workspace services to use Context.Service tags and consolidated module paths
  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.
Macroscope summarized 8fd3f54.
@coderabbitai
coderabbitaiBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Important
Review skipped
Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797
You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.
Use the checkbox below for a quick retry:
  •  🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  •  Create PR with unit tests
  •  Commit unit tests in branch codex/effect-service-server-workspace-project
Comment @coderabbitai help to get the list of available commands and usage tips.
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL
1,000+ changed lines (additions + deletions).
labels
Jun 20, 2026
@juliusmarmingejuliusmarminge
changed the title
Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions
github-actionsBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
🚀 Expo continuous deployment is ready!
  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR
macroscopeapp[bot]
macroscopeappBot
reviewed
Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge
marked this pull request as ready for review
June 20, 2026 02:06
@macroscopeapp
macroscopeappBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Approvability
Verdict: Approved
This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.
You can customize Macroscope's approvability policy. Learn more.
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
41c4584 to
467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
467c615 to
3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:10
Dismissing prior approval to re-evaluate 3278f2b
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
3278f2b to
711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:32
Dismissing prior approval to re-evaluate 711d999
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
f67b906 to
bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bd621c3 to
6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 04:35
Dismissing prior approval to re-evaluate 6cca072
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
ff916a0 to
e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
e4625d7 to
91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 05:06
Dismissing prior approval to re-evaluate 91d61c1
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
4 times, most recently
from
678babb to
bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bfe0f6d to
5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
cb7b3f2 to
273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others
added 4 commits
June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
46dbceb to
8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 06:58
Dismissing prior approval to re-evaluate 8fd3f54
@juliusmarminge
juliusmarminge
merged commit b0a3a50
into
mainJun 20, 2026

16 checks passed

@juliusmarminge
juliusmarminge
deleted the

codex/effect-service-server-workspace-project

branch
June 20, 2026 07:12
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit
to darjss/t3code
that referenced
this pull request
Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees


No one assigned


Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge

, '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
[codex] Refactor project and workspace Effect services - #3190
Merged
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged
[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Conversation
@juliusmarminge
@juliusmarmingejuliusmarminge
commented
Jun 20, 2026•

edited by macroscopeapp
Bot
Loading

Copy link


Copy Markdown

Member
Summary
  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules
Scope
Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.
Validation
  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads
Note
Medium Risk

Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.
Overview

This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).
ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.
Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.
ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.
Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.
Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Refactor project and workspace services to use Context.Service tags and consolidated module paths
  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.
Macroscope summarized 8fd3f54.
@coderabbitai
coderabbitaiBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Important
Review skipped
Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797
You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.
Use the checkbox below for a quick retry:
  •  🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  •  Create PR with unit tests
  •  Commit unit tests in branch codex/effect-service-server-workspace-project
Comment @coderabbitai help to get the list of available commands and usage tips.
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL
1,000+ changed lines (additions + deletions).
labels
Jun 20, 2026
@juliusmarmingejuliusmarminge
changed the title
Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions
github-actionsBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
🚀 Expo continuous deployment is ready!
  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR
macroscopeapp[bot]
macroscopeappBot
reviewed
Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge
marked this pull request as ready for review
June 20, 2026 02:06
@macroscopeapp
macroscopeappBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Approvability
Verdict: Approved
This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.
You can customize Macroscope's approvability policy. Learn more.
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
41c4584 to
467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
467c615 to
3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:10
Dismissing prior approval to re-evaluate 3278f2b
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
3278f2b to
711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:32
Dismissing prior approval to re-evaluate 711d999
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
f67b906 to
bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bd621c3 to
6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 04:35
Dismissing prior approval to re-evaluate 6cca072
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
ff916a0 to
e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
e4625d7 to
91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 05:06
Dismissing prior approval to re-evaluate 91d61c1
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
4 times, most recently
from
678babb to
bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bfe0f6d to
5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
cb7b3f2 to
273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others
added 4 commits
June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
46dbceb to
8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 06:58
Dismissing prior approval to re-evaluate 8fd3f54
@juliusmarminge
juliusmarminge
merged commit b0a3a50
into
mainJun 20, 2026

16 checks passed

@juliusmarminge
juliusmarminge
deleted the

codex/effect-service-server-workspace-project

branch
June 20, 2026 07:12
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit
to darjss/t3code
that referenced
this pull request
Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees


No one assigned


Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge

, '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
[codex] Refactor project and workspace Effect services - #3190
Merged
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged
[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Conversation
@juliusmarminge
@juliusmarmingejuliusmarminge
commented
Jun 20, 2026•

edited by macroscopeapp
Bot
Loading

Copy link


Copy Markdown

Member
Summary
  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules
Scope
Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.
Validation
  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads
Note
Medium Risk

Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.
Overview

This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).
ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.
Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.
ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.
Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.
Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Refactor project and workspace services to use Context.Service tags and consolidated module paths
  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.
Macroscope summarized 8fd3f54.
@coderabbitai
coderabbitaiBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Important
Review skipped
Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797
You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.
Use the checkbox below for a quick retry:
  •  🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  •  Create PR with unit tests
  •  Commit unit tests in branch codex/effect-service-server-workspace-project
Comment @coderabbitai help to get the list of available commands and usage tips.
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL
1,000+ changed lines (additions + deletions).
labels
Jun 20, 2026
@juliusmarmingejuliusmarminge
changed the title
Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions
github-actionsBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
🚀 Expo continuous deployment is ready!
  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR
macroscopeapp[bot]
macroscopeappBot
reviewed
Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge
marked this pull request as ready for review
June 20, 2026 02:06
@macroscopeapp
macroscopeappBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Approvability
Verdict: Approved
This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.
You can customize Macroscope's approvability policy. Learn more.
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
41c4584 to
467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
467c615 to
3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:10
Dismissing prior approval to re-evaluate 3278f2b
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
3278f2b to
711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:32
Dismissing prior approval to re-evaluate 711d999
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
f67b906 to
bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bd621c3 to
6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 04:35
Dismissing prior approval to re-evaluate 6cca072
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
ff916a0 to
e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
e4625d7 to
91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 05:06
Dismissing prior approval to re-evaluate 91d61c1
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
4 times, most recently
from
678babb to
bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bfe0f6d to
5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
cb7b3f2 to
273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others
added 4 commits
June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
46dbceb to
8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 06:58
Dismissing prior approval to re-evaluate 8fd3f54
@juliusmarminge
juliusmarminge
merged commit b0a3a50
into
mainJun 20, 2026

16 checks passed

@juliusmarminge
juliusmarminge
deleted the

codex/effect-service-server-workspace-project

branch
June 20, 2026 07:12
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit
to darjss/t3code
that referenced
this pull request
Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees


No one assigned


Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge

, '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
[codex] Refactor project and workspace Effect services - #3190
Merged
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged
[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Conversation
@juliusmarminge
@juliusmarmingejuliusmarminge
commented
Jun 20, 2026•

edited by macroscopeapp
Bot
Loading

Copy link


Copy Markdown

Member
Summary
  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules
Scope
Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.
Validation
  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads
Note
Medium Risk

Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.
Overview

This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).
ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.
Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.
ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.
Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.
Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Refactor project and workspace services to use Context.Service tags and consolidated module paths
  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.
Macroscope summarized 8fd3f54.
@coderabbitai
coderabbitaiBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Important
Review skipped
Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797
You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.
Use the checkbox below for a quick retry:
  •  🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  •  Create PR with unit tests
  •  Commit unit tests in branch codex/effect-service-server-workspace-project
Comment @coderabbitai help to get the list of available commands and usage tips.
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL
1,000+ changed lines (additions + deletions).
labels
Jun 20, 2026
@juliusmarmingejuliusmarminge
changed the title
Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions
github-actionsBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
🚀 Expo continuous deployment is ready!
  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR
macroscopeapp[bot]
macroscopeappBot
reviewed
Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge
marked this pull request as ready for review
June 20, 2026 02:06
@macroscopeapp
macroscopeappBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Approvability
Verdict: Approved
This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.
You can customize Macroscope's approvability policy. Learn more.
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
41c4584 to
467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
467c615 to
3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:10
Dismissing prior approval to re-evaluate 3278f2b
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
3278f2b to
711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:32
Dismissing prior approval to re-evaluate 711d999
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
f67b906 to
bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bd621c3 to
6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 04:35
Dismissing prior approval to re-evaluate 6cca072
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
ff916a0 to
e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
e4625d7 to
91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 05:06
Dismissing prior approval to re-evaluate 91d61c1
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
4 times, most recently
from
678babb to
bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bfe0f6d to
5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
cb7b3f2 to
273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others
added 4 commits
June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
46dbceb to
8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 06:58
Dismissing prior approval to re-evaluate 8fd3f54
@juliusmarminge
juliusmarminge
merged commit b0a3a50
into
mainJun 20, 2026

16 checks passed

@juliusmarminge
juliusmarminge
deleted the

codex/effect-service-server-workspace-project

branch
June 20, 2026 07:12
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit
to darjss/t3code
that referenced
this pull request
Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees


No one assigned


Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge

, '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
[codex] Refactor project and workspace Effect services - #3190
Merged
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged
[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Conversation
@juliusmarminge
@juliusmarmingejuliusmarminge
commented
Jun 20, 2026•

edited by macroscopeapp
Bot
Loading

Copy link


Copy Markdown

Member
Summary
  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules
Scope
Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.
Validation
  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads
Note
Medium Risk

Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.
Overview

This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).
ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.
Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.
ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.
Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.
Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Refactor project and workspace services to use Context.Service tags and consolidated module paths
  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.
Macroscope summarized 8fd3f54.
@coderabbitai
coderabbitaiBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Important
Review skipped
Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797
You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.
Use the checkbox below for a quick retry:
  •  🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  •  Create PR with unit tests
  •  Commit unit tests in branch codex/effect-service-server-workspace-project
Comment @coderabbitai help to get the list of available commands and usage tips.
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL
1,000+ changed lines (additions + deletions).
labels
Jun 20, 2026
@juliusmarmingejuliusmarminge
changed the title
Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions
github-actionsBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
🚀 Expo continuous deployment is ready!
  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR
macroscopeapp[bot]
macroscopeappBot
reviewed
Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge
marked this pull request as ready for review
June 20, 2026 02:06
@macroscopeapp
macroscopeappBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Approvability
Verdict: Approved
This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.
You can customize Macroscope's approvability policy. Learn more.
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
41c4584 to
467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
467c615 to
3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:10
Dismissing prior approval to re-evaluate 3278f2b
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
3278f2b to
711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:32
Dismissing prior approval to re-evaluate 711d999
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
f67b906 to
bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bd621c3 to
6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 04:35
Dismissing prior approval to re-evaluate 6cca072
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
ff916a0 to
e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
e4625d7 to
91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 05:06
Dismissing prior approval to re-evaluate 91d61c1
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
4 times, most recently
from
678babb to
bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bfe0f6d to
5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
cb7b3f2 to
273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others
added 4 commits
June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
46dbceb to
8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 06:58
Dismissing prior approval to re-evaluate 8fd3f54
@juliusmarminge
juliusmarminge
merged commit b0a3a50
into
mainJun 20, 2026

16 checks passed

@juliusmarminge
juliusmarminge
deleted the

codex/effect-service-server-workspace-project

branch
June 20, 2026 07:12
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit
to darjss/t3code
that referenced
this pull request
Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees


No one assigned


Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge

, '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
[codex] Refactor project and workspace Effect services - #3190
Merged
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged
[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Conversation
@juliusmarminge
@juliusmarmingejuliusmarminge
commented
Jun 20, 2026•

edited by macroscopeapp
Bot
Loading

Copy link


Copy Markdown

Member
Summary
  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules
Scope
Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.
Validation
  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads
Note
Medium Risk

Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.
Overview

This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).
ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.
Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.
ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.
Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.
Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Refactor project and workspace services to use Context.Service tags and consolidated module paths
  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.
Macroscope summarized 8fd3f54.
@coderabbitai
coderabbitaiBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Important
Review skipped
Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797
You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.
Use the checkbox below for a quick retry:
  •  🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  •  Create PR with unit tests
  •  Commit unit tests in branch codex/effect-service-server-workspace-project
Comment @coderabbitai help to get the list of available commands and usage tips.
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL
1,000+ changed lines (additions + deletions).
labels
Jun 20, 2026
@juliusmarmingejuliusmarminge
changed the title
Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions
github-actionsBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
🚀 Expo continuous deployment is ready!
  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR
macroscopeapp[bot]
macroscopeappBot
reviewed
Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge
marked this pull request as ready for review
June 20, 2026 02:06
@macroscopeapp
macroscopeappBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Approvability
Verdict: Approved
This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.
You can customize Macroscope's approvability policy. Learn more.
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
41c4584 to
467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
467c615 to
3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:10
Dismissing prior approval to re-evaluate 3278f2b
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
3278f2b to
711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:32
Dismissing prior approval to re-evaluate 711d999
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
f67b906 to
bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bd621c3 to
6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 04:35
Dismissing prior approval to re-evaluate 6cca072
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
ff916a0 to
e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
e4625d7 to
91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 05:06
Dismissing prior approval to re-evaluate 91d61c1
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
4 times, most recently
from
678babb to
bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bfe0f6d to
5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
cb7b3f2 to
273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others
added 4 commits
June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
46dbceb to
8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 06:58
Dismissing prior approval to re-evaluate 8fd3f54
@juliusmarminge
juliusmarminge
merged commit b0a3a50
into
mainJun 20, 2026

16 checks passed

@juliusmarminge
juliusmarminge
deleted the

codex/effect-service-server-workspace-project

branch
June 20, 2026 07:12
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit
to darjss/t3code
that referenced
this pull request
Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees


No one assigned


Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge

, '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
[codex] Refactor project and workspace Effect services - #3190
Merged
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Jun 20, 2026
Merged
[codex] Refactor project and workspace Effect services#3190
juliusmarminge merged 4 commits into
mainfrom 
codex/effect-service-server-workspace-project
Conversation
@juliusmarminge
@juliusmarmingejuliusmarminge
commented
Jun 20, 2026•

edited by macroscopeapp
Bot
Loading

Copy link


Copy Markdown

Member
Summary
  • hoisted the project, workspace, and server-environment Effect services into canonical domain-root modules
  • colocated schemas, inline Context.Service contracts, real make implementations, and canonical layer exports, using Service["Service"] instead of standalone shape types
  • updated in-scope consumers to service-module namespace imports while keeping contracts, utility packages, config-free helpers, and implementation helpers as named imports
  • preserved module, service-contract, method, and implementation documentation while moving implementations
  • removed the legacy Services/ and Layers/ compatibility modules and rewired every remaining caller to canonical domain-root modules
Scope
Orchestration, MCP, and integration-harness behavior remains unchanged; their imports and layer references are mechanically rewired to the canonical domain-root modules so no legacy compatibility paths remain.
Validation
  • changed backend suites: 21 files, 369 tests passed
  • vp check: 0 errors; 20 pre-existing warnings
  • vp run typecheck: 15/15 tasks passed
  • canonical audit: 8 root service modules with inline contracts and exported make/layer
  • import audit: no whole-package contracts namespace imports and no namespace imports for pure helper modules
  • test declarations: 2,228 before and after
  • git diff --check
  • no unresolved review threads
Note
Medium Risk

Wide refactor across workspace file I/O, project setup scripts, and server startup error shapes; behavior is mostly preserved but client-visible error messages and failure payloads changed in several paths.
Overview

This PR consolidates several Effect services (ServerEnvironment, RepositoryIdentityResolver, ProjectFaviconResolver, ProjectSetupScriptRunner, WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem) into canonical domain-root modules that colocate the Context.Service tag, make, and exported layer. It deletes the old project/workspace/environmentServices/ and Layers/ compatibility files and rewires orchestration, CLI, MCP, relay, assets, and integration tests to namespace imports (e.g. WorkspacePaths.layer, RepositoryIdentityResolver.RepositoryIdentityResolver).
ProjectSetupScriptRunner is reimplemented at the project root with Schema tagged errors (ProjectSetupScriptOperationError, ProjectSetupScriptProjectNotFoundError) instead of a single message-only error; Git/bootstrap and server tests now expect operation-specific failure text.
Workspace browse/search/list and file read/write gain structured error types (WorkspaceEntriesCurrentProjectRequiredError, WorkspaceEntriesReadDirectoryError, WorkspaceFileSystemError with cause, etc.). WebSocket RPC handlers map many workspace failures to generic client messages (e.g. "Failed to search workspace entries.") while retaining cause on the error object.
ServerRuntimeStartupError now carries mode / host / port and a required cause instead of a command-readiness stage field; startup tests were updated accordingly.
Minor mechanical cleanups include direct Node builtin imports (createServer, createPublicKey, readdir) where files were touched.
Reviewed by Cursor Bugbot for commit 8fd3f54. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Refactor project and workspace services to use Context.Service tags and consolidated module paths
  • Replaces scattered Services/* and Layers/* module paths with consolidated per-feature modules (e.g. WorkspacePaths, ProjectFaviconResolver, RepositoryIdentityResolver, ServerEnvironment, ProjectSetupScriptRunner) each exporting a layer and a Context.Service tag.
  • Rewrites WorkspacePaths, WorkspaceEntries, WorkspaceFileSystem, and ProjectSetupScriptRunner with typed tagged error classes (e.g. WorkspaceRootNotExistsError, WorkspaceEntriesCurrentProjectRequiredError, ProjectSetupScriptOperationError) replacing generic error strings.
  • Adds ProjectSetupScriptRunner as a proper Effect service with runForThread, typed success/failure results, and tests covering no-script and terminal-start paths.
  • Adds WorkspaceFileSystem as a new service with readFile enforcing root containment, file-type validation, size limits, and binary detection.
  • Updates all consumers across orchestration, CLI, relay, MCP, cloud, and integration layers to use the new module paths and .layer exports.
  • Behavioral Change: RPC error messages for workspace search, list, read-file, and browse are now generic strings (e.g. "Failed to search workspace entries.") rather than including internal cause.detail text.
Macroscope summarized 8fd3f54.
@coderabbitai
coderabbitaiBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Important
Review skipped
Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b5d4cc3c-f149-4977-95b8-597e2f11a797
You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.
Use the checkbox below for a quick retry:
  •  🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  •  Create PR with unit tests
  •  Commit unit tests in branch codex/effect-service-server-workspace-project
Comment @coderabbitai help to get the list of available commands and usage tips.
@github-actionsgithub-actionsBot
added

vouch:trusted
PR author is trusted by repo permissions or the VOUCHED list.
size:XXL
1,000+ changed lines (additions + deletions).
labels
Jun 20, 2026
@juliusmarmingejuliusmarminge
changed the title
Refactor project and workspace Effect services[codex] Refactor project and workspace Effect servicesJun 20, 2026
@github-actions
github-actionsBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
🚀 Expo continuous deployment is ready!
  • Project → t3-code
  • Platforms → android, ios
  • Scheme → t3code-preview
🤖 Android🍎 iOS
Fingerprintfe5a51f2e189da69dfc4c2cd458e6cfb5fdff2eaae3bd597809dfd7771d0898f735d172973d4c1c8
Build DetailsBuild Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Build Permalink
DetailsDistribution: INTERNAL
Build profile: preview:dev
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
App version: 0.1.0
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update DetailsUpdate Permalink
DetailsBranch: pr-3190
Runtime version: fe5a51f2e189da69dfc4c2cd458e6cfb5fdff2ea
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update Permalink
DetailsBranch: pr-3190
Runtime version: ae3bd597809dfd7771d0898f735d172973d4c1c8
Git commit: 4110b7ef4c76a5d3c990eb7ab6dfce6c771c624c
Update QR
macroscopeapp[bot]
macroscopeappBot
reviewed
Jun 20, 2026
View reviewed changes
Comment threadapps/server/src/workspace/WorkspaceFileSystem.ts
@juliusmarminge
juliusmarminge
marked this pull request as ready for review
June 20, 2026 02:06
@macroscopeapp
macroscopeappBot
commented
Jun 20, 2026•

edited

Loading

Copy link


Copy Markdown

Contributor
Approvability
Verdict: Approved
This PR consolidates Effect service definitions from separate Layers/Services directories into unified modules. The changes are mechanical reorganization (file moves, import updates, export name standardization) with no runtime behavior changes beyond minor error message improvements.
You can customize Macroscope's approvability policy. Learn more.
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
41c4584 to
467c615CompareJune 20, 2026 02:53
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
467c615 to
3278f2bCompareJune 20, 2026 03:10
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:10
Dismissing prior approval to re-evaluate 3278f2b
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
3278f2b to
711d999CompareJune 20, 2026 03:32
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 03:32
Dismissing prior approval to re-evaluate 711d999
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
f67b906 to
bd621c3CompareJune 20, 2026 04:09
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bd621c3 to
6cca072CompareJune 20, 2026 04:34
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 04:35
Dismissing prior approval to re-evaluate 6cca072
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
ff916a0 to
e4625d7CompareJune 20, 2026 04:54
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
e4625d7 to
91d61c1CompareJune 20, 2026 05:06
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 05:06
Dismissing prior approval to re-evaluate 91d61c1
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
4 times, most recently
from
678babb to
bfe0f6dCompareJune 20, 2026 05:57
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
from
bfe0f6d to
5e909deCompareJune 20, 2026 06:02
macroscopeapp[bot]
macroscopeappBot
previously approved these changes
Jun 20, 2026
View reviewed changes
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
cb7b3f2 to
273e7f9CompareJune 20, 2026 06:38
juliusmarmingeand others
added 4 commits
June 19, 2026 23:52
@juliusmarminge@codex
Refactor project and workspace Effect services
9b9ef19
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
use named imports for non-service modules
43a1a0b
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Finish workspace service normalization
2d03378
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge@codex
Preserve workspace service error causes
8fd3f54
Co-authored-by: codex <codex@users.noreply.github.com>
@juliusmarminge
juliusmarmingeforce-pushed
the
codex/effect-service-server-workspace-project
branch
2 times, most recently
from
46dbceb to
8fd3f54CompareJune 20, 2026 06:58
@macroscopeapp
macroscopeappBot
dismissed
their stale reviewJune 20, 2026 06:58
Dismissing prior approval to re-evaluate 8fd3f54
@juliusmarminge
juliusmarminge
merged commit b0a3a50
into
mainJun 20, 2026

16 checks passed

@juliusmarminge
juliusmarminge
deleted the

codex/effect-service-server-workspace-project

branch
June 20, 2026 07:12
NeilTheFisher pushed a commit
to NeilTheFisher/t3code
that referenced
this pull request
Aug 18, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
f04f8f3
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit
to darjss/t3code
that referenced
this pull request
Aug 26, 2026
@juliusmarminge@codex
[codex] Refactor project and workspace Effect services (pingdotgg#3190)
3d09ed9
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@macroscopeappmacroscopeapp[bot]macroscopeapp[bot] approved these changes

Assignees


No one assigned


Labels

size:XXL1,000+ changed lines (additions + deletions).vouch:trustedPR author is trusted by repo permissions or the VOUCHED list.

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@juliusmarminge