fix: address app studio preview review findings

Author: cwilhit

Makefile

@@ -1110,7 +1110,7 @@ uninstall-provider-app-studio: ## Delete App Studio CatalogEntry
 
 # --- App Studio sandbox runner image (live development runtimes) ---
 SANDBOX_RUNNER_IMAGE ?= ghcr.io/faroshq/kedge-sandbox-runner:dev
-SANDBOX_TOKEN_GENERATOR_IMAGE ?= docker.io/bitnami/kubectl:latest
+SANDBOX_TOKEN_GENERATOR_IMAGE ?= docker.io/bitnami/kubectl@sha256:b9f4412e53f09d76b0991cdd29c0feff4c1d1e112b307e0ab155e5b050a9f4ec
 SANDBOX_RUNNER_PLATFORM ?= linux/$(ARCH)
 
 docker-build-sandbox-runner: ## Build the App Studio sandbox runner image used by SandboxRunner pods

providers/app-studio/api/assistant_checkpoint.go

@@ -30,7 +30,6 @@ import (
 	aiv1alpha1 "github.com/faroshq/provider-app-studio/apis/ai/v1alpha1"
 	asclient "github.com/faroshq/provider-app-studio/client"
 	"github.com/faroshq/provider-app-studio/store"
-	"github.com/faroshq/provider-app-studio/workspace"
 )
 
 type projectAssistantCheckpointState struct {
@@ -135,8 +134,8 @@ func appendProjectAssistantResumePendingUI(out *projectAssistantResumeResponse,
 	}
 }
 
-func (s *Server) appendProjectAssistantResumeDevelopmentPreviewRefreshUI(ctx context.Context, out *projectAssistantResumeResponse, scope workspace.Scope, before string, beforeOK bool, toolCalls []projectToolCallStreamEvent) {
-	if out == nil || !s.projectAssistantPreviewRefreshNeeded(ctx, scope, before, beforeOK, toolCalls) {
+func appendProjectAssistantResumeDevelopmentPreviewRefreshUI(out *projectAssistantResumeResponse, needed bool) {
+	if out == nil || !needed {
 		return
 	}
 	out.UIEvents = append(out.UIEvents, projectAssistantUIDevelopmentPreviewRefreshEvent())
@@ -577,12 +576,11 @@ func (s *Server) resumeClaimedProjectAssistantRunWithEinoCheckpoint(
 	}
 	currentRequestID := run.RequestID
 	currentToolCallID := strings.TrimSpace(state.Eino.ToolCallID)
-	workspaceDigestBefore, workspaceDigestErr := s.projectWorkspaceSyncDigest(ctx, engineReq.WorkspaceScope)
-	workspaceDigestOK := workspaceDigestErr == nil
 	result, err := s.projectAssistantEngine().ResumeProjectAssistant(ctx, engineReq, resumeReq, state)
 	currentToolCall := projectAssistantResumeToolCall(streamedToolCalls, currentToolCallID)
 	out.ToolCall = currentToolCall
 	out.Result = projectAssistantResumeToolResult(result.Content, currentToolCall)
+	previewRefreshNeeded := s.projectAssistantPreviewRefreshNeeded(ctx, engineReq.WorkspaceScope, "", false, streamedToolCalls)
 	if err != nil {
 		var permissionErr *projectAssistantPermissionRequiredError
 		if !errors.As(err, &permissionErr) {
@@ -617,7 +615,7 @@ func (s *Server) resumeClaimedProjectAssistantRunWithEinoCheckpoint(
 				assistantMessageID := strings.TrimSpace(resumeReq.AssistantMessageID)
 				appendProjectAssistantResumeResolvedUI(&out, assistantMessageID, currentRequestID, currentToolCall)
 				appendProjectAssistantResumePendingUI(&out, assistantMessageID)
-				s.appendProjectAssistantResumeDevelopmentPreviewRefreshUI(ctx, &out, engineReq.WorkspaceScope, workspaceDigestBefore, workspaceDigestOK, streamedToolCalls)
+				appendProjectAssistantResumeDevelopmentPreviewRefreshUI(&out, previewRefreshNeeded)
 				messageUpdate := out
 				messageUpdate.RunID = run.ID
 				messageUpdate.RequestID = currentRequestID
@@ -665,7 +663,7 @@ func (s *Server) resumeClaimedProjectAssistantRunWithEinoCheckpoint(
 		assistantMessageID := strings.TrimSpace(resumeReq.AssistantMessageID)
 		appendProjectAssistantResumeResolvedUI(&out, assistantMessageID, currentRequestID, currentToolCall)
 		appendProjectAssistantResumePendingUI(&out, assistantMessageID)
-		s.appendProjectAssistantResumeDevelopmentPreviewRefreshUI(ctx, &out, engineReq.WorkspaceScope, workspaceDigestBefore, workspaceDigestOK, streamedToolCalls)
+		appendProjectAssistantResumeDevelopmentPreviewRefreshUI(&out, previewRefreshNeeded)
 		messageUpdate := out
 		messageUpdate.RunID = run.ID
 		messageUpdate.RequestID = currentRequestID
@@ -705,7 +703,7 @@ func (s *Server) resumeClaimedProjectAssistantRunWithEinoCheckpoint(
 	}
 	out.Status = run.Status
 	appendProjectAssistantResumeResolvedUI(&out, strings.TrimSpace(resumeReq.AssistantMessageID), currentRequestID, currentToolCall)
-	s.appendProjectAssistantResumeDevelopmentPreviewRefreshUI(ctx, &out, engineReq.WorkspaceScope, workspaceDigestBefore, workspaceDigestOK, streamedToolCalls)
+	appendProjectAssistantResumeDevelopmentPreviewRefreshUI(&out, previewRefreshNeeded)
 	if err := s.updateProjectAssistantPermissionMessage(persistCtx, messageScope, strings.TrimSpace(resumeReq.AssistantMessageID), out); err != nil {
 		return projectAssistantResumeResponse{}, err
 	}

providers/app-studio/api/assistant_eino_tool.go

@@ -195,6 +195,9 @@ func (t projectEinoAssistantTool) invokeAllowedTool(ctx context.Context, callID
 	if err != nil {
 		return t.finishFailedToolCall(callID, spec.Name, projectEinoToolArgumentsString(args), err.Error()), nil
 	}
+	if t.server != nil {
+		t.server.scheduleDevelopmentSyncAfterMutation(t.req.Identity, t.req.Project, spec.Name)
+	}
 	t.emitToolCall(projectToolCallStreamEvent{
 		ID:        callID,
 		Name:      spec.Name,

providers/app-studio/api/assistant_eino_tool_test.go

@@ -20,6 +20,9 @@ import (
 	"context"
 	"strings"
 	"testing"
+
+	aiv1alpha1 "github.com/faroshq/provider-app-studio/apis/ai/v1alpha1"
+	"github.com/faroshq/provider-app-studio/workspace"
 )
 
 func TestEinoApprovePlanToolRejectsMissingAllowedOperations(t *testing.T) {
@@ -81,3 +84,43 @@ func TestEinoToolPassesSessionSnapshotToLocalTool(t *testing.T) {
 		t.Fatal("tool received mutable run-state session snapshot")
 	}
 }
+
+func TestEinoToolSchedulesDevelopmentSyncAfterMutatingTool(t *testing.T) {
+	runState := newProjectEinoAssistantRunState()
+	server := &Server{}
+	var gotName string
+	var gotProjectName string
+	server.developmentSyncAfterMutation = func(_ identity, p *aiv1alpha1.Project, name string) {
+		gotName = name
+		if p != nil {
+			gotProjectName = p.Name
+		}
+	}
+	localTool := projectAssistantToolFunc{
+		spec: projectAssistantToolSpec{
+			Name: projectToolWriteFile,
+			Risk: projectAssistantToolRiskWrite,
+		},
+		call: func(context.Context, projectAssistantToolCallRequest) (string, error) {
+			return `{"status":"ok"}`, nil
+		},
+	}
+	project := &aiv1alpha1.Project{}
+	project.Name = "demo"
+	tool := projectEinoAssistantTool{
+		server: server,
+		tool:   localTool,
+		req: projectAssistantRunRequest{
+			Project:        project,
+			WorkspaceScope: workspace.Scope{OrgUUID: "org-a", WorkspaceUUID: "ws-1", ProjectName: "demo"},
+		},
+		runState: runState,
+	}
+
+	if _, err := tool.invokeAllowedTool(context.Background(), "call-write", localTool.Spec(), map[string]any{"path": "src/App.tsx"}); err != nil {
+		t.Fatalf("invokeAllowedTool returned error: %v", err)
+	}
+	if gotName != projectToolWriteFile || gotProjectName != "demo" {
+		t.Fatalf("scheduled sync = (%q, %q), want (%q, demo)", gotName, gotProjectName, projectToolWriteFile)
+	}
+}

providers/app-studio/api/assistant_events.go

@@ -16,14 +16,16 @@ limitations under the License.
 
 package api
 
-import "context"
+import (
+	"context"
+	"strconv"
+)
 
 type projectAssistantStreamWriter struct {
 	assistantID       string
 	began             bool
 	rootChildren      []string
 	msgIdx            int
-	assistantContent  string
 	assistantDataKey  string
 	assistantShellSet bool
 	pendingPermission *projectAssistantPermission
@@ -155,8 +157,7 @@ func (w *projectAssistantStreamWriter) writeAssistantContent(ctx context.Context
 		}
 		w.assistantShellSet = true
 	}
-	w.assistantContent += delta
-	return w.write(projectMessageStreamEventFromUI(projectAssistantUIDataUpdateEvent(w.assistantID, w.assistantDataKey, w.assistantContent)))
+	return w.write(projectMessageStreamEventFromUI(projectAssistantUIDataAppendEvent(w.assistantID, w.assistantDataKey, delta)))
 }
 
 func (w *projectAssistantStreamWriter) writeToolCard(ctx context.Context, kind, text string) error {
@@ -212,28 +213,14 @@ func (w *projectAssistantStreamWriter) ensureBegin(ctx context.Context) error {
 func (w *projectAssistantStreamWriter) nextMessageComponentIDs() (string, string, string, string) {
 	idx := w.msgIdx
 	w.msgIdx++
-	cardID := "msg-" + intString(idx) + "-card"
-	colID := "msg-" + intString(idx) + "-col"
-	labelID := "msg-" + intString(idx) + "-label"
-	textID := "msg-" + intString(idx) + "-text"
+	id := strconv.Itoa(idx)
+	cardID := "msg-" + id + "-card"
+	colID := "msg-" + id + "-col"
+	labelID := "msg-" + id + "-label"
+	textID := "msg-" + id + "-text"
 	return cardID, colID, labelID, textID
 }
 
-func intString(value int) string {
-	if value == 0 {
-		return "0"
-	}
-	const digits = "0123456789"
-	var buf [20]byte
-	i := len(buf)
-	for value > 0 {
-		i--
-		buf[i] = digits[value%10]
-		value /= 10
-	}
-	return string(buf[i:])
-}
-
 func projectAssistantUIToolCardText(action projectAssistantUIAction) string {
 	if action.Summary != "" {
 		return action.Label + "\n" + action.Summary

providers/app-studio/api/assistant_events_test.go

@@ -49,8 +49,37 @@ func TestProjectAssistantStreamWriterMapsDeltaToUIDataModelUpdate(t *testing.T)
 		t.Fatalf("third event = %#v, want dataModelUpdate UI event", got[2])
 	}
 	contents := got[2].DataModelUpdate.Contents
-	if len(contents) != 1 || contents[0].Key != "assistant-1/msg-0-text" || contents[0].ValueString != "hello" {
-		t.Fatalf("data model contents = %#v, want assistant content binding", contents)
+	if len(contents) != 1 || contents[0].Key != "assistant-1/msg-0-text" || contents[0].ValueString != "hello" || !contents[0].Append {
+		t.Fatalf("data model contents = %#v, want appended assistant content binding", contents)
+	}
+}
+
+func TestProjectAssistantStreamWriterStreamsAssistantDeltasWithoutReplayingContent(t *testing.T) {
+	got, err := collectProjectAssistantStreamEvents(
+		projectAssistantEvent{
+			Type:  projectAssistantEventMessageDelta,
+			Delta: "hello",
+		},
+		projectAssistantEvent{
+			Type:  projectAssistantEventMessageDelta,
+			Delta: " world",
+		},
+	)
+	if err != nil {
+		t.Fatalf("EmitProjectAssistantEvent returned error: %v", err)
+	}
+	if len(got) != 4 {
+		t.Fatalf("events = %#v, want beginRendering, shell, and two dataModelUpdates", got)
+	}
+	for i, want := range []string{"hello", " world"} {
+		event := got[i+2]
+		if event.DataModelUpdate == nil || len(event.DataModelUpdate.Contents) != 1 {
+			t.Fatalf("event[%d] = %#v, want one dataModelUpdate content", i+2, event)
+		}
+		content := event.DataModelUpdate.Contents[0]
+		if content.ValueString != want || !content.Append {
+			t.Fatalf("event[%d] content = %#v, want append delta %q", i+2, content, want)
+		}
 	}
 }
 
@@ -376,6 +405,7 @@ func TestStreamProjectAssistantEmitsCanonicalLifecycleSequence(t *testing.T) {
 		"dataModelUpdate",
 		"surfaceUpdate",
 		"surfaceUpdate",
+		"dataModelUpdate",
 		"run_finished",
 	}
 	if len(got) != len(wantTypes) {
@@ -392,12 +422,15 @@ func TestStreamProjectAssistantEmitsCanonicalLifecycleSequence(t *testing.T) {
 	assertA2UICard(t, got[1], "tool call", "Editing files")
 	assertA2UICard(t, got[5], "tool call", "Editing files")
 	assertA2UICard(t, got[6], "tool result", "Edited files")
-	if got[7].Type != string(projectAssistantEventRunFinished) || got[7].AssistantMessageID != "assistant-sequence" {
-		t.Fatalf("terminal event = %#v, want run_finished for assistant-sequence", got[7])
+	if !projectMessageStreamEventsHaveContent([]projectMessageStreamEvent{got[7]}, projectAssistantUIDevelopmentPreviewRefreshKey) {
+		t.Fatalf("preview refresh event = %#v, want preview refresh signal", got[7])
+	}
+	if got[8].Type != string(projectAssistantEventRunFinished) || got[8].AssistantMessageID != "assistant-sequence" {
+		t.Fatalf("terminal event = %#v, want run_finished for assistant-sequence", got[8])
 	}
 }
 
-func TestStreamProjectAssistantEmitsPreviewRefreshWhenWorkspaceDigestChanges(t *testing.T) {
+func TestStreamProjectAssistantEmitsPreviewRefreshAfterMutatingToolCall(t *testing.T) {
 	settings := projectLLMSettings{
 		Provider: defaultProjectLLMProvider,
 		BaseURL:  defaultProjectLLMBaseURL,
@@ -519,6 +552,12 @@ func (projectAssistantWorkspaceMutationEngine) StreamProjectAssistant(ctx contex
 	if _, err := req.Workspace.WriteFile(ctx, req.WorkspaceScope, workspace.WriteOptions{Path: "src/App.tsx", Content: "export function App() { return <main>Updated</main> }\n"}); err != nil {
 		return projectAssistantRunResult{}, err
 	}
+	req.StreamCallbacks.OnToolCall(projectToolCallStreamEvent{
+		ID:      "tool-1",
+		Name:    projectToolWriteFile,
+		Status:  "succeeded",
+		Summary: "Updated file",
+	})
 	req.StreamCallbacks.OnChunk("Updated the app.")
 	return projectAssistantRunResult{Content: "Updated the app."}, nil
 }

providers/app-studio/api/assistant_ui_events.go

@@ -95,6 +95,7 @@ type projectAssistantUIDataModelUpdate struct {
 type projectAssistantUIDataContent struct {
 	Key         string `json:"key"`
 	ValueString string `json:"valueString,omitempty"`
+	Append      bool   `json:"append,omitempty"`
 }
 
 type projectAssistantUIInterruptRequest struct {
@@ -123,12 +124,21 @@ func projectAssistantUIBeginRenderingEvent(surfaceID string) projectAssistantUIE
 }
 
 func projectAssistantUIDataUpdateEvent(surfaceID, key, value string) projectAssistantUIEvent {
+	return projectAssistantUIDataContentEvent(surfaceID, key, value, false)
+}
+
+func projectAssistantUIDataAppendEvent(surfaceID, key, value string) projectAssistantUIEvent {
+	return projectAssistantUIDataContentEvent(surfaceID, key, value, true)
+}
+
+func projectAssistantUIDataContentEvent(surfaceID, key, value string, appendValue bool) projectAssistantUIEvent {
 	return projectAssistantUIEvent{
 		DataModelUpdate: &projectAssistantUIDataModelUpdate{
 			SurfaceID: surfaceID,
 			Contents: []projectAssistantUIDataContent{{
 				Key:         key,
 				ValueString: value,
+				Append:      appendValue,
 			}},
 		},
 	}