Skip to content

Fix remote workspace alias resolution #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chubes4 merged 1 commit into from
May 29, 2026
+27 −0
Merged

Fix remote workspace alias resolution #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions inc/Workspace/RemoteWorkspaceBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,7 @@ public function git_push( string $handle, string $remote = 'origin', ?string $br
* @return array<string,mixed>
*/
private function resolve_handle( string $handle ): array|\WP_Error {
$handle = $this->resolve_alias($handle);
$state = $this->state();
if ( isset($state['worktrees'][ $handle ]) ) {
$worktree = (array) $state['worktrees'][ $handle ];
Expand All @@ -1091,6 +1092,7 @@ private function resolve_handle( string $handle ): array|\WP_Error {
}

private function resolve_repo( string $repo_name ): string|\WP_Error {
$repo_name = $this->resolve_alias($repo_name);
$state = $this->state();
if ( isset($state['repos'][ $repo_name ]['repo']) ) {
return (string) $state['repos'][ $repo_name ]['repo'];
Expand All @@ -1103,6 +1105,14 @@ private function resolve_repo( string $repo_name ): string|\WP_Error {
return new \WP_Error('remote_workspace_repo_not_found', sprintf('Remote workspace repository "%s" is not registered. Call workspace_clone first.', $repo_name), array( 'status' => 404 ));
}

private function resolve_alias( string $handle ): string {
if ( class_exists(WorkspaceAliasResolver::class) ) {
return WorkspaceAliasResolver::resolve($handle);
}

return $handle;
}

private function repo_from_url( string $url ): string|\WP_Error {
$url = trim($url);
if ( preg_match('#github\.com[:/]([^/]+)/([^/.]+)(?:\.git)?$#', $url, $matches) ) {
Expand Down
17 changes: 17 additions & 0 deletions tests/smoke-remote-workspace-backend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ function update_option( string $key, mixed $value, bool $autoload = true ): bool
}

include __DIR__ . '/../inc/Support/GitRunner.php';
include __DIR__ . '/../inc/Workspace/WorkspaceAliasResolver.php';
include __DIR__ . '/../inc/Workspace/RemoteWorkspaceBackend.php';

use DataMachineCode\Abilities\GitHubAbilities;
Expand All @@ -168,9 +169,22 @@ function update_option( string $key, mixed $value, bool $autoload = true ): bool
$worktree = $backend->worktree_add('example', 'fix/example');
$assert('worktree add returns DMC handle', ! is_wp_error($worktree) && 'example@fix-example' === $worktree['handle']);

update_option(
'datamachine_code_workspace_aliases',
array(
'current-project' => array(
'target' => 'example@fix-example',
'root' => '.agent-workspace/current-project',
),
)
);

$read = $backend->read_file('example@fix-example', 'src/example.php', 1000000);
$assert('read falls back to default branch content', ! is_wp_error($read) && str_contains($read['content'], 'old'));

$alias_read = $backend->read_file('current-project', 'src/example.php', 1000000);
$assert('read resolves current-project alias to remote worktree', ! is_wp_error($alias_read) && str_contains($alias_read['content'], 'old'));

$primary_grep = $backend->grep('example', 'old', 'src', '*.php', 10, 1);
$assert('grep searches registered primary before worktree edits', ! is_wp_error($primary_grep) && 1 === $primary_grep['count'] && 'src/example.php' === $primary_grep['matches'][0]['path'] && 2 === $primary_grep['matches'][0]['line'] && ! empty($primary_grep['matches'][0]['context']));

Expand All @@ -191,6 +205,9 @@ function update_option( string $key, mixed $value, bool $autoload = true ): bool
$status = $backend->git_status('example@fix-example');
$assert('status reports pending file as dirty', ! is_wp_error($status) && 1 === $status['dirty'] && array( 'src/example.php' ) === $status['files']);

$alias_status = $backend->git_status('current-project');
$assert('status resolves current-project alias to remote worktree', ! is_wp_error($alias_status) && 1 === $alias_status['dirty'] && array( 'src/example.php' ) === $alias_status['files']);

$commit = $backend->git_commit('example@fix-example', 'fix: update example');
$assert('commit writes via GitHub API', ! is_wp_error($commit) && 'commit-1' === $commit['commit']);
$assert('commit uses requested message', 'fix: update example' === GitHubAbilities::$commits[0]['message']);
Expand Down
Loading