Skip to content

Commit 9f041b3

Browse files
jaaydenhjaaydenh
committed
Merge branch 'main' of https://github.com/coder/coder 
2 parents 92c5559 + ef101ae commit 9f041b3

File tree

16 files changed

+44
-39
lines changed

16 files changed

+44
-39
lines changed

‎docs/ai-coder/best-practices.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
> [!NOTE]
44
>
5-
> This functionality is in early access and is evolving rapidly.
5+
> This functionality is in beta and is evolving rapidly.
66
>
7-
> For now, we recommend testing it in a demo or staging environment,
8-
> rather than deploying to production.
7+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
8+
> Always review AI-generated content before using it in critical systems.
99
>
1010
> Join our [Discord channel](https://discord.gg/coder) or
1111
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/coder-dashboard.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
> [!NOTE]
22
>
3-
> This functionality is in early access and is evolving rapidly.
3+
> This functionality is in beta and is evolving rapidly.
44
>
5-
> For now, we recommend testing it in a demo or staging environment,
6-
> rather than deploying to production.
5+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
6+
> Always review AI-generated content before using it in critical systems.
77
>
88
> Join our [Discord channel](https://discord.gg/coder) or
99
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/create-template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
> [!NOTE]
44
>
5-
> This functionality is in early access and is evolving rapidly.
5+
> This functionality is in beta and is evolving rapidly.
66
>
7-
> For now, we recommend testing it in a demo or staging environment,
8-
> rather than deploying to production.
7+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
8+
> Always review AI-generated content before using it in critical systems.
99
>
1010
> Join our [Discord channel](https://discord.gg/coder) or
1111
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/custom-agents.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
> [!NOTE]
44
>
5-
> This functionality is in early access and is evolving rapidly.
5+
> This functionality is in beta and is evolving rapidly.
66
>
7-
> For now, we recommend testing it in a demo or staging environment,
8-
> rather than deploying to production.
7+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
8+
> Always review AI-generated content before using it in critical systems.
99
>
1010
> Join our [Discord channel](https://discord.gg/coder) or
1111
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/headless.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
> [!NOTE]
22
>
3-
> This functionality is in early access and is evolving rapidly.
3+
> This functionality is in beta and is evolving rapidly.
44
>
5-
> For now, we recommend testing it in a demo or staging environment,
6-
> rather than deploying to production.
5+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
6+
> Always review AI-generated content before using it in critical systems.
77
>
88
> Join our [Discord channel](https://discord.gg/coder) or
99
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/ide-integration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
> [!NOTE]
22
>
3-
> This functionality is in early access and is evolving rapidly.
3+
> This functionality is in beta and is evolving rapidly.
44
>
5-
> For now, we recommend testing it in a demo or staging environment,
6-
> rather than deploying to production.
5+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
6+
> Always review AI-generated content before using it in critical systems.
77
>
88
> Join our [Discord channel](https://discord.gg/coder) or
99
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
> [!NOTE]
44
>
5-
> This functionality is in early access and is evolving rapidly.
5+
> This functionality is in beta and is evolving rapidly.
66
>
7-
> For now, we recommend testing it in a demo or staging environment,
8-
> rather than deploying to production.
7+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
8+
> Always review AI-generated content before using it in critical systems.
99
>
1010
> Join our [Discord channel](https://discord.gg/coder) or
1111
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/issue-tracker.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
> [!NOTE]
44
>
5-
> This functionality is in early access and is evolving rapidly.
5+
> This functionality is in beta and is evolving rapidly.
66
>
7-
> For now, we recommend testing it in a demo or staging environment,
8-
> rather than deploying to production.
7+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
8+
> Always review AI-generated content before using it in critical systems.
99
>
1010
> Join our [Discord channel](https://discord.gg/coder) or
1111
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/ai-coder/securing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
>
33
> This functionality is in early access and is evolving rapidly.
44
>
5-
> For now, we recommend testing it in a demo or staging environment,
6-
> rather than deploying to production.
5+
> When using any AI tool for development, exercise a level of caution appropriate to your use case and environment.
6+
> Always review AI-generated content before using it in critical systems.
77
>
88
> Join our [Discord channel](https://discord.gg/coder) or
99
> [contact us](https://coder.com/contact) to get help or share feedback.

‎docs/images/guides/ai-agents/landing.png

-23 KB
Loading

‎docs/images/icons/wand.svg

Lines changed: 1 addition & 3 deletions
Loading

‎docs/manifest.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@
684684
"description": "Learn how to run and integrate AI coding agents like GPT-Code, OpenDevin, or SWE-Agent in Coder workspaces to boost developer productivity.",
685685
"path": "./ai-coder/index.md",
686686
"icon_path": "./images/icons/wand.svg",
687-
"state": ["early access"],
687+
"state": ["beta"],
688688
"children": [
689689
{
690690
"title": "Learn about coding agents",
@@ -695,37 +695,37 @@
695695
"title": "Create a Coder template for agents",
696696
"description": "Create a purpose-built template for your AI agents",
697697
"path": "./ai-coder/create-template.md",
698-
"state": ["early access"]
698+
"state": ["beta"]
699699
},
700700
{
701701
"title": "Integrate with your issue tracker",
702702
"description": "Assign tickets to AI agents and interact via code reviews",
703703
"path": "./ai-coder/issue-tracker.md",
704-
"state": ["early access"]
704+
"state": ["beta"]
705705
},
706706
{
707707
"title": "Model Context Protocols (MCP) and adding AI tools",
708708
"description": "Improve results by adding tools to your AI agents",
709709
"path": "./ai-coder/best-practices.md",
710-
"state": ["early access"]
710+
"state": ["beta"]
711711
},
712712
{
713713
"title": "Supervise agents via Coder UI",
714714
"description": "Interact with agents via the Coder UI",
715715
"path": "./ai-coder/coder-dashboard.md",
716-
"state": ["early access"]
716+
"state": ["beta"]
717717
},
718718
{
719719
"title": "Supervise agents via the IDE",
720720
"description": "Interact with agents via VS Code or Cursor",
721721
"path": "./ai-coder/ide-integration.md",
722-
"state": ["early access"]
722+
"state": ["beta"]
723723
},
724724
{
725725
"title": "Programmatically manage agents",
726726
"description": "Manage agents via MCP, the Coder CLI, and/or REST API",
727727
"path": "./ai-coder/headless.md",
728-
"state": ["early access"]
728+
"state": ["beta"]
729729
},
730730
{
731731
"title": "Securing agents in Coder",
@@ -737,7 +737,7 @@
737737
"title": "Custom agents",
738738
"description": "Learn how to use custom agents with Coder",
739739
"path": "./ai-coder/custom-agents.md",
740-
"state": ["early access"]
740+
"state": ["beta"]
741741
}
742742
]
743743
},

‎dogfood/coder/main.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,10 @@ resource "coder_agent" "dev" {
353353
# Allow synchronization between scripts.
354354
trap 'touch /tmp/.coder-startup-script.done' EXIT
355355
356+
# Increase the shutdown timeout of the docker service for improved cleanup.
357+
# The 240 was picked as it's lower than the 300 seconds we set for the
358+
# container shutdown grace period.
359+
sudo sh -c 'jq ". += {\"shutdown-timeout\": 240}" /etc/docker/daemon.json > /tmp/daemon.json.new && mv /tmp/daemon.json.new /etc/docker/daemon.json'
356360
# Start Docker service
357361
sudo service docker start
358362
# Install playwright dependencies

‎enterprise/coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,5 +1166,5 @@ func (api *API) setupPrebuilds(featureEnabled bool) (agplprebuilds.Reconciliatio
11661166

11671167
reconciler := prebuilds.NewStoreReconciler(api.Database, api.Pubsub, api.DeploymentValues.Prebuilds,
11681168
api.Logger.Named("prebuilds"), quartz.NewReal(), api.PrometheusRegistry)
1169-
return reconciler, prebuilds.EnterpriseClaimer{}
1169+
return reconciler, prebuilds.NewEnterpriseClaimer(api.Database)
11701170
}

‎enterprise/coderd/coderd_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func TestEntitlements_Prebuilds(t *testing.T) {
331331

332332
if tc.expectedEnabled {
333333
require.IsType(t, &prebuilds.StoreReconciler{}, *reconciler)
334-
require.IsType(t, prebuilds.EnterpriseClaimer{}, *claimer)
334+
require.IsType(t, &prebuilds.EnterpriseClaimer{}, *claimer)
335335
} else {
336336
require.Equal(t, &agplprebuilds.DefaultReconciler, reconciler)
337337
require.Equal(t, &agplprebuilds.DefaultClaimer, claimer)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ export const AgentRow: FC<AgentRowProps> = ({
158158
]),
159159
enabled: agent.status === "connected",
160160
select: (res) => res.containers.filter((c) => c.status === "running"),
161+
// TODO: Implement a websocket connection to get updates on containers
162+
// without having to poll.
163+
refetchInterval: 10_000,
161164
});
162165

163166
return (

0 commit comments

Comments
 (0)