Merge pull request #1329 from wakatime/bugfix/copilot

Fix copilot parser for string variable values

Author: alanhamlett

pkg/ai/copilot.go

@@ -149,6 +149,33 @@ type (
 	}
 )
 
+func (v *copilotVariable) UnmarshalJSON(data []byte) error {
+	type alias struct {
+		Kind  string          `json:"kind"`
+		ID    string          `json:"id"`
+		Value json.RawMessage `json:"value"`
+	}
+
+	var decoded alias
+	if err := json.Unmarshal(data, &decoded); err != nil {
+		return err
+	}
+
+	v.Kind = decoded.Kind
+	v.ID = decoded.ID
+
+	if len(decoded.Value) == 0 || string(decoded.Value) == "null" {
+		return nil
+	}
+
+	var pathValue copilotPathValue
+	if err := json.Unmarshal(decoded.Value, &pathValue); err == nil {
+		v.Value = &pathValue
+	}
+
+	return nil
+}
+
 func (m *copilotMessageWithURIs) UnmarshalJSON(data []byte) error {
 	if data == nil || string(data) == "null" {
 		return nil

pkg/ai/copilot_test.go

@@ -221,3 +221,40 @@ func TestCopilotParseJSONLSession(t *testing.T) {
 	assert.Equal(t, "Copilot session-2", got[2].Entity)
 	assert.Equal(t, heartbeat.AppType, got[2].EntityType)
 }
+
+func TestCopilotParseJSONLSession_IgnoresStringVariableValues(t *testing.T) {
+	home := t.TempDir()
+	t.Setenv("HOME", home)
+	t.Setenv("USERPROFILE", home)
+
+	workspaceDir := filepath.Join(home, "Library", "Application Support", "Code", "User", "workspaceStorage", "workspace-3")
+	require.NoError(t, os.MkdirAll(filepath.Join(workspaceDir, "chatSessions"), 0o755))
+
+	sessionPath := filepath.Join(workspaceDir, "chatSessions", "session-3.jsonl")
+	lines := []string{
+		strings.Join([]string{
+			`{"kind":0,"v":{"version":3,"creationDate":1771000000000,`,
+			`"sessionId":"session-3","requests":[{"requestId":"request-b",`,
+			`"timestamp":1771000005000,`,
+			`"agent":{"extensionVersion":"0.43.0"},`,
+			`"message":{"text":"Find bugs in this repo"},`,
+			`"variableData":{"variables":[{"id":"vscode.customizations.index",`,
+			`"kind":"promptText","value":"<skills>...</skills>"}]},`,
+			`"response":[]}]}}`,
+		}, ""),
+		`{"kind":1,"k":["requests",0,"modelState"],"v":{"value":1,"completedAt":1771000009000}}`,
+	}
+	require.NoError(t, os.WriteFile(sessionPath, []byte(strings.Join(lines, "\n")+"\n"), 0o644))
+
+	got, err := ai.Copilot{
+		After:             time.Unix(1771000000, 0),
+		FallbackUserAgent: "editor/1.0.0",
+	}.Parse(t.Context())
+	require.NoError(t, err)
+	require.Len(t, got, 2)
+
+	assert.Equal(t, "Copilot session-3", got[0].Entity)
+	assert.Equal(t, heartbeat.AppType, got[0].EntityType)
+	assert.Equal(t, "Copilot session-3", got[1].Entity)
+	assert.Equal(t, heartbeat.AppType, got[1].EntityType)
+}