8000 feat: support devcontainer agents in ui and unify backend by mafredri · Pull Request #18332 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: support devcontainer agents in ui and unify backend #18332

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
merged 29 commits into from
Jun 17, 2025
Merged

feat: support devcontainer agents in ui and unify backend #18332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
765c2cf
backend
mafredri Jun 10, 2025
4019358
ui-1
mafredri Jun 10, 2025
452dbc9
backend-2
mafredri Jun 10, 2025
6a23998
ui-2
mafredri Jun 10, 2025
ee3ed36
backend-3
mafredri Jun 11, 2025
fc1a90a
ui-3
mafredri Jun 11, 2025
88ce78f
ui-wip
mafredri Jun 11, 2025
b1431a3
ui-wip2
mafredri Jun 13, 2025
2c2bf28
backend fix test after rebase
mafredri Jun 13, 2025
18e1593
ui-final?
mafredri Jun 13, 2025
df28ff9
oh no I accidentally the coercion
mafredri Jun 13, 2025
9f69f69
site: remove circ dependency
mafredri Jun 13, 2025
ecfe483
site: add tests
mafredri Jun 13, 2025
71c61b6
whelp
mafredri Jun 13, 2025
2e1c31f
tweak app display
mafredri Jun 13, 2025
7e41c15
add port forward test
mafredri Jun 13, 2025
79e1844
cleanup
mafredri Jun 13, 2025
8ce0aec
dont show content (due to margin) when there are no apps
mafredri Jun 16, 2025
d3bda05
rewrite styles as Tailwind CSS
mafredri Jun 16, 2025
d4f208b
review comments
mafredri Jun 16, 2025
7e5ede0
review comments
mafredri Jun 16, 2025
7a3674a
add comment about idempotency
mafredri Jun 16, 2025
c0607b1
switch -> if
mafredri Jun 16, 2025
e1ea4bf
rename apps to agentapps
mafredri Jun 16, 2025
f150bad
refactor to use mutation
mafredri Jun 16, 2025
2b22ee2
adjust refetch trigger
mafredri Jun 17, 2025
4b9d218
fix linter
mafredri Jun 17, 2025
e021c8d
Update agent/agentcontainers/api.go
mafredri Jun 17, 2025
0c44de8
clarify todo
mafredri Jun 17, 2025
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
Prev Previous commit
Next Next commit
cleanup
  • Loading branch information
@mafredri
mafredri committed Jun 13, 2025
commit 79e1844d25c97b3e51e76fe585a7dce8ecf7fa14
34 changes: 3 additions & 31 deletions site/src/modules/resources/AgentDevcontainerCard.stories.tsx
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type { Meta, StoryObj } from "@storybook/react";
import type { WorkspaceAgentDevcontainer } from "api/typesGenerated";
import { getPreferredProxy } from "contexts/ProxyContext";
import { chromatic } from "testHelpers/chromatic";
import {
Expand All @@ -10,6 +9,7 @@ import {
MockWorkspaceAgent,
MockWorkspaceAgentContainer,
MockWorkspaceAgentContainerPorts,
MockWorkspaceAgentDevcontainer,
MockWorkspaceApp,
MockWorkspaceProxies,
MockWorkspaceSubAgent,
Expand All @@ -20,21 +20,6 @@ import {
} from "testHelpers/storybook";
import { AgentDevcontainerCard } from "./AgentDevcontainerCard";

const MockWorkspaceAgentDevcontainer: WorkspaceAgentDevcontainer = {
id: "test-devcontainer-id",
name: "test-devcontainer",
workspace_folder: "/workspace/test",
config_path: "/workspace/test/.devcontainer/devcontainer.json",
status: "running",
dirty: false,
container: MockWorkspaceAgentContainer,
agent: {
id: MockWorkspaceSubAgent.id,
name: MockWorkspaceSubAgent.name,
directory: MockWorkspaceSubAgent?.directory ?? "/workspace/test",
},
};

const meta: Meta<typeof AgentDevcontainerCard> = {
title: "modules/resources/AgentDevcontainerCard",
component: AgentDevcontainerCard,
Expand Down Expand Up @@ -80,10 +65,6 @@ export const Dirty: Story = {
devcontainer: {
...MockWorkspaceAgentDevcontainer,
dirty: true,
container: {
...MockWorkspaceAgentContainer,
ports: MockWorkspaceAgentContainerPorts,
},
},
},
};
Expand All @@ -94,10 +75,7 @@ export const Recreating: Story = {
...MockWorkspaceAgentDevcontainer,
dirty: true,
status: "starting",
container: {
...MockWorkspaceAgentContainer,
ports: MockWorkspaceAgentContainerPorts,
},
container: undefined,
},
subAgents: [],
},
Expand All @@ -115,12 +93,6 @@ export const NoSubAgent: Story = {

export const SubAgentConnecting: Story = {
args: {
devcontainer: {
...MockWorkspaceAgentDevcontainer,
container: {
...MockWorkspaceAgentContainer,
},
},
subAgents: [
{
...MockWorkspaceSubAgent,
Expand Down Expand Up @@ -148,7 +120,7 @@ export const WithAppsAndPorts: Story = {
},
};

export const ShowingPortForward: Story = {
export const WithPortForwarding: Story = {
decorators: [
withProxyProvider({
proxy: getPreferredProxy(MockWorkspaceProxies, MockPrimaryWorkspaceProxy),
Expand Down
12 changes: 1 addition & 11 deletions site/src/modules/resources/AgentRow.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,17 +288,7 @@ export const GroupApp: Story = {
export const Devcontainer: Story = {
beforeEach: () => {
spyOn(API, "getAgentContainers").mockResolvedValue({
devcontainers: [
{
id: "test-devcontainer-id",
name: "test-devcontainer",
workspace_folder: "/workspace/test",
config_path: "/workspace/test/.devcontainer/devcontainer.json",
status: "running",
dirty: false,
container: M.MockWorkspaceAgentContainer,
},
],
< 8000 /td> devcontainers: [M.MockWorkspaceAgentDevcontainer],
containers: [M.MockWorkspaceAgentContainer],
});
},
Expand Down
16 changes: 16 additions & 0 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4369,6 +4369,22 @@ export const MockWorkspaceAgentContainer: TypesGen.WorkspaceAgentContainer = {
},
};

export const MockWorkspaceAgentDevcontainer: TypesGen.WorkspaceAgentDevcontainer =
{
id: "test-devcontainer-id",
name: "test-devcontainer",
workspace_folder: "/workspace/test",
config_path: "/workspace/test/.devcontainer/devcontainer.json",
status: "running",
dirty: false,
container: MockWorkspaceAgentContainer,
agent: {
id: MockWorkspaceSubAgent.id,
name: MockWorkspaceSubAgent.name,
directory: MockWorkspaceSubAgent?.directory ?? "/workspace/test",
},
};

export const MockWorkspaceAppStatuses: TypesGen.WorkspaceAppStatus[] = [
{
// This is the latest status chronologically (15:04:38)
Expand Down
Loading
0