Merge branch 'main' into 35C4n0r/handle-partial-tool-call

Author: 35C4n0r

.github/workflows/release.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   build:
     name: Build Release Binaries
-    runs-on: depot-ubuntu-22.04-4
+    runs-on: ubuntu-latest-8-cores
     if: ${{ github.repository_owner == 'coder' }}
 
     steps:

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## v0.12.1
+
+### Fixes
+- Prevent terminal echo from being captured as agent messages
+- Update codex message box detection
+
+## v0.12.0
+
+### Features
+- Experimental ACP integration
+- Introduce state persistence
+
+### Fixes
+- Fix pr-preview and build-release workflow errors
+
+### Chore
+- Codebase refactor for abstraction
+- Go version bump to 1.24
+- Use coder/quartz
+
 ## v0.11.8
 
 ### Fix

chat/package.json

@@ -48,5 +48,5 @@
     "start": "next start",
     "storybook": "storybook dev -p 6006"
   },
-  "version": "0.11.8"
+  "version": "0.12.1"
 }

chat/src/app/layout.tsx

@@ -29,7 +29,7 @@ export default function RootLayout({
           disableTransitionOnChange
         >
           {children}
-          <Toaster richColors />
+          <Toaster richColors closeButton />
         </ThemeProvider>
       </body>
     </html>

chat/src/components/chat-provider.tsx

@@ -36,6 +36,12 @@ interface StatusChangeEvent {
   agent_type: string;
 }
 
+interface ErrorEventData {
+  message: string;
+  level: string;
+  time: string;
+}
+
 interface APIErrorDetail {
   location: string;
   message: string;
@@ -215,6 +221,25 @@ export function ChatProvider({ children }: PropsWithChildren) {
         setAgentType(data.agent_type === "" ? "unknown" : data.agent_type as AgentType);
       });
 
+      // Handle agent error events
+      eventSource.addEventListener("agent_error", (event) => {
+        const messageEvent = event as MessageEvent;
+        try {
+          const data: ErrorEventData = JSON.parse(messageEvent.data);
+
+          // Display error as toast notification that persists until manually dismissed
+          if (data.level === "error") {
+            toast.error(data.message, { duration: Infinity });
+          } else if (data.level === "warning") {
+            toast.warning(data.message, { duration: Infinity });
+          } else {
+            toast.info(data.message, { duration: Infinity });
+          }
+        } catch (e) {
+          console.error("Failed to parse agent_error event data:", e);
+        }
+      });
+
       // Handle connection open (server is online)
       eventSource.onopen = () => {
         // Connection is established, but we'll wait for status_change event
@@ -303,10 +328,9 @@ export function ChatProvider({ children }: PropsWithChildren) {
         description: message,
       });
     } finally {
+      // Remove optimistic draft message if still present (may have been replaced by server response via SSE).
+      setMessages((prev) => prev.filter((m) => !isDraftMessage(m)));
       if (type === "user") {
-        setMessages((prevMessages) =>
-          prevMessages.filter((m) => !isDraftMessage(m))
-        );
         setLoading(false);
       }
     }

cmd/attach/attach.go

@@ -129,7 +129,33 @@ func WriteRawInputOverHTTP(ctx context.Context, url string, msg string) error {
 	return nil
 }
 
-func runAttach(remoteUrl string) error {
+func checkACPMode(remoteURL string) (bool, error) {
+	resp, err := http.Get(remoteURL + "/status")
+	if err != nil {
+		return false, xerrors.Errorf("failed to check server status: %w", err)
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	if resp.StatusCode != http.StatusOK {
+		return false, xerrors.Errorf("unexpected %d response from server: %s", resp.StatusCode, resp.Status)
+	}
+
+	var status httpapi.StatusResponse
+	if err := json.NewDecoder(resp.Body).Decode(&status.Body); err != nil {
+		return false, xerrors.Errorf("failed to decode server status: %w", err)
+	}
+
+	return status.Body.Transport == httpapi.TransportACP, nil
+}
+
+func runAttach(remoteURL string) error {
+	// Check if server is running in ACP mode (attach not supported)
+	if isACP, err := checkACPMode(remoteURL); err != nil {
+		_, _ = fmt.Fprintf(os.Stderr, "WARN: Unable to check server: %s", err.Error())
+	} else if isACP {
+		return xerrors.New("attach is not yet supported in ACP mode")
+	}
+
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	stdin := int(os.Stdin.Fd())
@@ -152,7 +178,7 @@ func runAttach(remoteUrl string) error {
 	readScreenErrCh := make(chan error, 1)
 	go func() {
 		defer close(readScreenErrCh)
-		if err := ReadScreenOverHTTP(ctx, remoteUrl+"/internal/screen", screenCh); err != nil {
+		if err := ReadScreenOverHTTP(ctx, remoteURL+"/internal/screen", screenCh); err != nil {
 			if errors.Is(err, context.Canceled) {
 				return
 			}
@@ -175,7 +201,7 @@ func runAttach(remoteUrl string) error {
 				if input == "\x03" {
 					continue
 				}
-				if err := WriteRawInputOverHTTP(ctx, remoteUrl+"/message", input); err != nil {
+				if err := WriteRawInputOverHTTP(ctx, remoteURL+"/message", input); err != nil {
 					writeRawInputErrCh <- xerrors.Errorf("failed to write raw input: %w", err)
 					return
 				}

cmd/server/process_unix.go

@@ -0,0 +1,19 @@
+//go:build unix
+
+package server
+
+import (
+	"errors"
+	"os"
+	"syscall"
+)
+
+// isProcessRunning checks if a process with the given PID is running.
+func isProcessRunning(pid int) bool {
+	process, err := os.FindProcess(pid)
+	if err != nil {
+		return false
+	}
+	err = process.Signal(syscall.Signal(0))
+	return err == nil || errors.Is(err, syscall.EPERM)
+}

cmd/server/process_windows.go

@@ -0,0 +1,10 @@
+//go:build windows
+
+package server
+
+// isProcessRunning checks if a process with the given PID is running.
+// On Windows, Signal(0) is not supported, so this always returns false.
+// PID file liveness detection is best-effort on this platform.
+func isProcessRunning(_ int) bool {
+	return false
+}