coder · matifali · Dec 3, 2023 · Oct 10, 2023 · Oct 11, 2023 · Oct 11, 2023
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -235,6 +235,8 @@ func (api *API) workspaceAgentManifest(rw http.ResponseWriter, r *http.Request)
 
 	httpapi.Write(ctx, rw, http.StatusOK, agentsdk.Manifest{
 		AgentID:                  apiAgent.ID,
+		OwnerName:                owner.Username,
+		WorkspaceID:              workspace.ID,
 		Apps:                     convertApps(dbApps, workspaceAgent, owner.Username, workspace),
 		Scripts:                  convertScripts(scripts),
 		DERPMap:                  api.DERPMap(),

diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -1210,6 +1210,8 @@ func TestWorkspaceAgent_Metadata(t *testing.T) {
 	require.NoError(t, err)
 
 	// Verify manifest API response.
+	require.Equal(t, workspace.ID, manifest.WorkspaceID)
+	require.Equal(t, workspace.OwnerName, manifest.OwnerName)
 	require.Equal(t, "First Meta", manifest.Metadata[0].DisplayName)
 	require.Equal(t, "foo1", manifest.Metadata[0].Key)
 	require.Equal(t, "echo hi", manifest.Metadata[0].Script)

diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
@@ -89,6 +89,11 @@ func (c *Client) PostMetadata(ctx context.Context, key string, req PostMetadataR
 
 type Manifest struct {
 	AgentID uuid.UUID `json:"agent_id"`
+	// OwnerName and WorkspaceID are used by an open-source user to identify the workspace.
+	// We do not provide insurance that this will not be removed in the future,
+	// but if it's easy to persist lets keep it around.
+	OwnerName   string    `json:"owner_name"`
+	WorkspaceID uuid.UUID `json:"workspace_id"`
 	// GitAuthConfigs stores the number of Git configurations
 	// the Coder deployment has. If this number is >0, we
 	// set up special configuration in the workspace.

diff --git a/docs/api/agents.md b/docs/api/agents.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md