Skip to content

Conversation

@ammar-agent
Copy link
Collaborator

System message incorrectly stated all workspaces are git worktrees. With SSHRuntime, workspaces can be either worktrees (LocalRuntime) or regular git clones (SSHRuntime).

Changes

System Message Fix (based on review feedback)

  • buildEnvironmentContext() now uses runtime type to determine message
    • LocalRuntime: 'git worktree' with worktree-specific warnings
    • SSHRuntime: 'git repository' without worktree warnings
  • Updated buildSystemMessage() to accept Runtime parameter
  • Uses runtime instanceof LocalRuntime - cleaner than git detection
  • Added test to verify different messages for different runtimes

Worktree Reference Audit

  • Updated 30+ user-facing references from 'worktree' to 'workspace'
  • Fixed documentation (workspaces.md, intro.md, fork.md, system-prompt.md, AGENTS.md)
  • Updated UI components (NewWorkspaceModal, ForceDeleteModal, Modal.stories)
  • Fixed comments in types, config, and service files
  • Kept 170+ accurate references (git commands, LocalRuntime specifics)

Testing

  • ✅ All tests passing (6/6 in systemMessage.test.ts)
  • ✅ New test: verifies LocalRuntime vs SSHRuntime produce different messages

Result

The codebase now correctly distinguishes:

  • Workspace - Generic term for isolated development environments
  • Git worktree - Specific LocalRuntime implementation
  • Git clone - Specific SSHRuntime implementation

Files changed: 17 files, +107 insertions, -36 deletions

@ammar-agent ammar-agent force-pushed the rt-sys branch 3 times, most recently from 42d93f0 to 8cc1b55 Compare October 26, 2025 20:36
@ammario ammario added this pull request to the merge queue Oct 26, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 26, 2025
@ammario ammario reopened this Oct 27, 2025
@ammario ammario merged commit 5c93d22 into main Oct 27, 2025
26 checks passed
@ammario ammario deleted the rt-sys branch October 27, 2025 01:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants