coder · johnstcn · Apr 15, 2025 · Apr 11, 2025 · Apr 15, 2025 · Apr 15, 2025
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/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -537,16 +537,14 @@ func WorkspaceAppStatuses(statuses []database.WorkspaceAppStatus) []codersdk.Wor
 
 func WorkspaceAppStatus(status database.WorkspaceAppStatus) codersdk.WorkspaceAppStatus {
 	return codersdk.WorkspaceAppStatus{
-		ID:                 status.ID,
-		CreatedAt:          status.CreatedAt,
-		WorkspaceID:        status.WorkspaceID,
-		AgentID:            status.AgentID,
-		AppID:              status.AppID,
-		NeedsUserAttention: status.NeedsUserAttention,
-		URI:                status.Uri.String,
-		Icon:               status.Icon.String,
-		Message:            status.Message,
-		State:              codersdk.WorkspaceAppStatusState(status.State),
+		ID:          status.ID,
+		CreatedAt:   status.CreatedAt,
+		WorkspaceID: status.WorkspaceID,
+		AgentID:     status.AgentID,
+		AppID:       status.AppID,
+		URI:         status.Uri.String,
+		Message:     status.Message,
+		State:       codersdk.WorkspaceAppStatusState(status.State),
 	}
 }
 

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -9764,16 +9764,14 @@ func (q *FakeQuerier) InsertWorkspaceAppStatus(_ context.Context, arg database.I
 	defer q.mutex.Unlock()
 
 	status := database.WorkspaceAppStatus{
-		ID:                 arg.ID,
-		CreatedAt:          arg.CreatedAt,
-		WorkspaceID:        arg.WorkspaceID,
-		AgentID:            arg.AgentID,
-		AppID:              arg.AppID,
-		NeedsUserAttention: arg.NeedsUserAttention,
-		State:              arg.State,
-		Message:            arg.Message,
-		Uri:                arg.Uri,
-		Icon:               arg.Icon,
+		ID:          arg.ID,
+		CreatedAt:   arg.CreatedAt,
+		WorkspaceID: arg.WorkspaceID,
+		AgentID:     arg.AgentID,
+		AppID:       arg.AppID,
+		State:       arg.State,
+		Message:     arg.Message,
+		Uri:         arg.Uri,
 	}
 	q.workspaceAppStatuses = append(q.workspaceAppStatuses, status)
 	return status, nil

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000317_workspace_app_status_drop_fields.down.sql b/coderd/database/migrations/000317_workspace_app_status_drop_fields.down.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ONLY workspace_app_statuses
+		ADD COLUMN IF NOT EXISTS needs_user_attention BOOLEAN NOT NULL DEFAULT FALSE,
+		ADD COLUMN IF NOT EXISTS icon TEXT;
diff --git a/coderd/database/migrations/000317_workspace_app_status_drop_fields.up.sql b/coderd/database/migrations/000317_workspace_app_status_drop_fields.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ONLY workspace_app_statuses
+	DROP COLUMN IF EXISTS needs_user_attention,
+	DROP COLUMN IF EXISTS icon;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceapps.sql b/coderd/database/queries/workspaceapps.sql
@@ -44,8 +44,8 @@ WHERE
 	id = $1;
 
 -- name: InsertWorkspaceAppStatus :one
-INSERT INTO workspace_app_statuses (id, created_at, workspace_id, agent_id, app_id, state, message, needs_user_attention, uri, icon)
-VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+INSERT INTO workspace_app_statuses (id, created_at, workspace_id, agent_id, app_id, state, message, uri)
+VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
 RETURNING *;
 
 -- name: GetWorkspaceAppStatusesByAppIDs :many
@@ -54,6 +54,6 @@ SELECT * FROM workspace_app_statuses WHERE app_id = ANY(@ids :: uuid [ ]);
 -- name: GetLatestWorkspaceAppStatusesByWorkspaceIDs :many
 SELECT DISTINCT ON (workspace_id)
   *
-FROM workspace_app_statuses 
+FROM workspace_app_statuses
 WHERE workspace_id = ANY(@ids :: uuid[])
 ORDER BY workspace_id, created_at DESC;
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -366,11 +366,6 @@ func (api *API) patchWorkspaceAgentAppStatus(rw http.ResponseWriter, r *http.Req
 			String: req.URI,
 			Valid:  req.URI != "",
 		},
-		Icon: sql.NullString{
-			String: req.Icon,
-			Valid:  req.Icon != "",
-		},
-		NeedsUserAttention: req.NeedsUserAttention,
 	})
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{

diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -366,8 +366,10 @@ func TestWorkspaceAgentAppStatus(t *testing.T) {
 			AppSlug: "vscode",
 			Message: "testing",
 			URI:     "https://example.com",
-			Icon:    "https://example.com/icon.png",
 			State:   codersdk.WorkspaceAppStatusStateComplete,
+			// Ensure deprecated fields are ignored.
+			Icon:               "https://example.com/icon.png",
+			NeedsUserAttention: true,
 		})
 		require.NoError(t, err)
 
@@ -376,6 +378,9 @@ func TestWorkspaceAgentAppStatus(t *testing.T) {
 		agent, err := client.WorkspaceAgent(ctx, workspace.LatestBuild.Resources[0].Agents[0].ID)
 		require.NoError(t, err)
 		require.Len(t, agent.Apps[0].Statuses, 1)
+		// Deprecated fields should be ignored.
+		require.Empty(t, agent.Apps[0].Statuses[0].Icon)
+		require.False(t, agent.Apps[0].Statuses[0].NeedsUserAttention)
 	})
 }
 

diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
@@ -583,12 +583,14 @@ func (c *Client) PatchLogs(ctx context.Context, req PatchLogs) error {
 
 // PatchAppStatus updates the status of a workspace app.
 type PatchAppStatus struct {
-	AppSlug            string                           `json:"app_slug"`
-	NeedsUserAttention bool                             `json:"needs_user_attention"`
-	State              codersdk.WorkspaceAppStatusState `json:"state"`
-	Message            string                           `json:"message"`
-	URI                string                           `json:"uri"`
-	Icon               string                           `json:"icon"`
+	AppSlug string                           `json:"app_slug"`
+	State   codersdk.WorkspaceAppStatusState `json:"state"`
+	Message string                           `json:"message"`
+	URI     string                           `json:"uri"`
+	// Deprecated: this field is unused and will be removed in a future version.
+	Icon string `json:"icon"`
+	// Deprecated: this field is unused and will be removed in a future version.
+	NeedsUserAttention bool `json:"needs_user_attention"`
 }
 
 func (c *Client) PatchAppStatus(ctx context.Context, req PatchAppStatus) error {

diff --git a/codersdk/toolsdk/toolsdk.go b/codersdk/toolsdk/toolsdk.go
@@ -67,10 +67,6 @@ var (
 						"type":        "string",
 						"description": "A link to a relevant resource, such as a PR or issue.",
 					},
-					"emoji": map[string]any{
-						"type":        "string",
-						"description": "An emoji that visually represents your current progress. Choose an emoji that helps the user understand your current status at a glance.",
-					},
 					"state": map[string]any{
 						"type":        "string",
 						"description": "The state of your task. This can be one of the following: working, complete, or failure. Select the state that best represents your current progress.",
@@ -81,7 +77,7 @@ var (
 						},
 					},
 				},
-				Required: []string{"summary", "link", "emoji", "state"},
+				Required: []string{"summary", "link", "state"},
 			},
 		},
 		Handler: func(ctx context.Context, args map[string]any) (string, error) {
@@ -104,22 +100,16 @@ var (
 			if !ok {
 				return "", xerrors.New("link must be a string")
 			}
-			emoji, ok := args["emoji"].(string)
-			if !ok {
-				return "", xerrors.New("emoji must be a string")
-			}
 			state, ok := args["state"].(string)
 			if !ok {
 				return "", xerrors.New("state must be a string")
 			}
 
 			if err := agentClient.PatchAppStatus(ctx, agentsdk.PatchAppStatus{
-				AppSlug:            appSlug,
-				Message:            summary,
-				URI:                link,
-				Icon:               emoji,
-				NeedsUserAttention: false, // deprecated, to be removed later
-				State:              codersdk.WorkspaceAppStatusState(state),
+				AppSlug: appSlug,
+				Message: summary,
+				URI:     link,
+				State:   codersdk.WorkspaceAppStatusState(state),
 			}); err != nil {
 				return "", err
 			}

diff --git a/codersdk/toolsdk/toolsdk_test.go b/codersdk/toolsdk/toolsdk_test.go
@@ -75,7 +75,6 @@ func TestTools(t *testing.T) {
 			"summary": "test summary",
 			"state":   "complete",
 			"link":    "https://example.com",
-			"emoji":   "✅",
 		})
 		require.NoError(t, err)
 	})