Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite094e22

Browse files
feat(site): surface devcontainer start error
1 parent98c77fe commite094e22

File tree

10 files changed

+89
-4
lines changed

10 files changed

+89
-4
lines changed

‎agent/agentcontainers/api.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,8 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
685685
iferr!=nil {
686686
logger.Error(ctx,"inject subagent into container failed",slog.Error(err))
687687
}
688+
689+
dc.Error=err.Error()
688690
}
689691

690692
casedc.Container==nil:

‎coderd/apidoc/docs.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎codersdk/workspaceagents.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@ type WorkspaceAgentDevcontainer struct {
417417
Dirtybool`json:"dirty"`
418418
Container*WorkspaceAgentContainer`json:"container,omitempty"`
419419
Agent*WorkspaceAgentDevcontainerAgent`json:"agent,omitempty"`
420+
421+
Errorstring`json:"error,omitempty"`
420422
}
421423

422424
// WorkspaceAgentDevcontainerAgent represents the sub agent for a

‎docs/reference/api/agents.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎docs/reference/api/schemas.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎site/src/api/typesGenerated.ts

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎site/src/modules/resources/AgentDevcontainerCard.tsx

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import type {
66
WorkspaceAgentDevcontainer,
77
WorkspaceAgentListContainersResponse,
88
}from"api/typesGenerated";
9+
910
import{Button}from"components/Button/Button";
1011
import{displayError}from"components/GlobalSnackbar/utils";
1112
import{Spinner}from"components/Spinner/Spinner";
@@ -27,12 +28,13 @@ import { portForwardURL } from "utils/portForward";
2728
import{AgentApps,organizeAgentApps}from"./AgentApps/AgentApps";
2829
import{AgentButton}from"./AgentButton";
2930
import{AgentLatency}from"./AgentLatency";
30-
import{SubAgentStatus}from"./AgentStatus";
31+
import{DevcontainerStatus}from"./AgentStatus";
3132
import{PortForwardButton}from"./PortForwardButton";
3233
import{AgentSSHButton}from"./SSHButton/SSHButton";
3334
import{SubAgentOutdatedTooltip}from"./SubAgentOutdatedTooltip";
3435
import{TerminalLink}from"./TerminalLink/TerminalLink";
3536
import{VSCodeDevContainerButton}from"./VSCodeDevContainerButton/VSCodeDevContainerButton";
37+
import{cn}from"utils/cn";
3638

3739
typeAgentDevcontainerCardProps={
3840
parentAgent:WorkspaceAgent;
@@ -190,7 +192,10 @@ export const AgentDevcontainerCard: FC<AgentDevcontainerCardProps> = ({
190192
key={devcontainer.id}
191193
direction="column"
192194
spacing={0}
193-
className="relative py-4 border border-dashed border-border rounded"
195+
className={cn(
196+
"relative py-4 border border-dashed border-border rounded",
197+
devcontainer.error&&"border-content-destructive border-solid",
198+
)}
194199
>
195200
<div
196201
className="absolute -top-2 left-5
@@ -208,7 +213,11 @@ export const AgentDevcontainerCard: FC<AgentDevcontainerCardProps> = ({
208213
>
209214
<divclassName="flex items-center gap-6 text-xs text-content-secondary">
210215
<divclassName="flex items-center gap-4 md:w-full">
211-
<SubAgentStatusagent={subAgent}/>
216+
<DevcontainerStatus
217+
devcontainer={devcontainer}
218+
parentAgent={parentAgent}
219+
agent={subAgent}
220+
/>
212221
<span
213222
className="max-w-xs shrink-0
214223
overflow-hidden text-ellipsis whitespace-nowrap
@@ -273,6 +282,12 @@ export const AgentDevcontainerCard: FC<AgentDevcontainerCardProps> = ({
273282
</div>
274283
</header>
275284

285+
{devcontainer.error&&(
286+
<divclassName="px-8 pt-2 text-xs text-content-destructive">
287+
{devcontainer.error}
288+
</div>
289+
)}
290+
276291
{(showSubAgentApps||showSubAgentAppsPlaceholders)&&(
277292
<divclassName="flex flex-col gap-8 px-8 pt-4">
278293
{subAgent&&

‎site/src/modules/resources/AgentRow.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ export const AgentRow: FC<AgentRowProps> = ({
156156
shouldDisplayAppsSection=false;
157157
}
158158

159+
// Check if any devcontainers have errors to gray out agent border
160+
consthasDevcontainerErrors=devcontainers?.some((dc)=>dc.error);
161+
159162
return(
160163
<Stack
161164
key={agent.id}
@@ -165,6 +168,7 @@ export const AgentRow: FC<AgentRowProps> = ({
165168
styles.agentRow,
166169
styles[`agentRow-${agent.status}`],
167170
styles[`agentRow-lifecycle-${agent.lifecycle_state}`],
171+
hasDevcontainerErrors&&styles.agentRowWithErrors,
168172
]}
169173
>
170174
<headercss={styles.header}>
@@ -537,4 +541,8 @@ const styles = {
537541
position:"relative",
538542
},
539543
}),
544+
545+
agentRowWithErrors:(theme)=>({
546+
borderColor:theme.palette.divider,
547+
}),
540548
}satisfiesRecord<string,Interpolation<Theme>>;

‎site/src/modules/resources/AgentStatus.tsx

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
importtype{Interpolation,Theme}from"@emotion/react";
22
importLinkfrom"@mui/material/Link";
33
importTooltipfrom"@mui/material/Tooltip";
4-
importtype{WorkspaceAgent}from"api/typesGenerated";
4+
importtype{
5+
WorkspaceAgent,
6+
WorkspaceAgentDevcontainer,
7+
}from"api/typesGenerated";
58
import{ChooseOne,Cond}from"components/Conditionals/ChooseOne";
69
import{
710
HelpTooltip,
@@ -50,6 +53,12 @@ interface SubAgentStatusProps {
5053
agent?:WorkspaceAgent;
5154
}
5255

56+
interfaceDevcontainerStatusProps{
57+
devcontainer:WorkspaceAgentDevcontainer;
58+
parentAgent:WorkspaceAgent;
59+
agent?:WorkspaceAgent;
60+
}
61+
5362
constStartTimeoutLifecycle:FC<AgentStatusProps>=({ agent})=>{
5463
return(
5564
<HelpTooltip>
@@ -296,6 +305,44 @@ export const SubAgentStatus: FC<SubAgentStatusProps> = ({ agent }) => {
296305
);
297306
};
298307

308+
exportconstDevcontainerStartError:FC<AgentStatusProps>=({ agent})=>{
309+
return(
310+
<HelpTooltip>
311+
<PopoverTriggerrole="status"aria-label="Start error">
312+
<TriangleAlertIconcss={styles.errorWarning}/>
313+
</PopoverTrigger>
314+
<HelpTooltipContent>
315+
<HelpTooltipTitle>
316+
Error starting the devcontainer agent
317+
</HelpTooltipTitle>
318+
<HelpTooltipText>
319+
Something went wrong during the devcontainer agent startup.{" "}
320+
<Link
321+
target="_blank"
322+
rel="noreferrer"
323+
href={agent.troubleshooting_url}
324+
>
325+
Troubleshoot
326+
</Link>
327+
.
328+
</HelpTooltipText>
329+
</HelpTooltipContent>
330+
</HelpTooltip>
331+
);
332+
};
333+
334+
exportconstDevcontainerStatus:FC<DevcontainerStatusProps>=({
335+
devcontainer,
336+
parentAgent,
337+
agent,
338+
})=>{
339+
if(devcontainer.error){
340+
return<DevcontainerStartErroragent={parentAgent}/>;
341+
}
342+
343+
return<SubAgentStatusagent={agent}/>;
344+
};
345+
299346
conststyles={
300347
status:{
301348
width:6,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp