Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/daemon/internal/agent/claudesdk/bridge_output.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (s *session) bridgeOutput() *bridgeOutput {
scanner.Buffer(make([]byte, 64*1024), 2*1024*1024)
for scanner.Scan() {
raw := append([]byte(nil), scanner.Bytes()...)
if !s.receiveWorkspaceRead(raw) && !s.receiveWorkspaceDirectory(raw) {
if !s.receiveWorkspaceDirectory(raw) {
output.frames <- raw
}
}
Expand Down
2 changes: 0 additions & 2 deletions apps/daemon/internal/agent/claudesdk/contracts.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ var (
_ agent.FunctionResultSubmitter = (*session)(nil)
_ agent.PermissionResponder = (*session)(nil)
_ agent.UserChoiceResponder = (*session)(nil)
_ agent.WorkspaceReader = (*session)(nil)
_ agent.WorkspaceDirectoryLister = (*session)(nil)
_ agent.WorkspaceWriter = (*session)(nil)
_ agent.WorkspaceReader = (*executor)(nil)
_ agent.WorkspaceDirectoryLister = (*executor)(nil)
_ agent.WorkspaceWriter = (*executor)(nil)
)
5 changes: 0 additions & 5 deletions apps/daemon/internal/agent/claudesdk/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ func startExecutor(ctx context.Context, checked *runtimeCheckCache, probe Config
if err != nil {
return nil, err
}
base.reads.supported = slices.Contains(info.Features, "workspace_read")
base.directories.supported = slices.Contains(info.Features, "workspace_directory")
e := &executor{base: base, start: start, ready: make(chan error, 1), done: make(chan struct{}), nativeID: start.Resume}
go e.read()
Expand Down Expand Up @@ -180,7 +179,6 @@ func (e *executor) read() {
}
<-stderrDone
_ = e.base.process.Wait()
e.base.stopWorkspaceReads()
e.base.stopWorkspaceDirectories()
e.mu.Lock()
e.invalid = true
Expand Down Expand Up @@ -320,9 +318,6 @@ func (s *session) invalidate() {
}
}

func (e *executor) ReadWorkspaceFile(ctx context.Context, path string, maxBytes int) (agent.WorkspaceReadResult, error) {
return e.base.ReadWorkspaceFile(ctx, path, maxBytes)
}
func (e *executor) ListWorkspaceDirectory(ctx context.Context, path string, maxEntries int) (agent.WorkspaceDirectoryResult, error) {
return e.base.ListWorkspaceDirectory(ctx, path, maxEntries)
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func preparationRequest() proto.PromptRequestPayload {
func runPreparationHelper() {
mode := os.Getenv("SDK_HELPER_MODE")
if len(os.Args) > 1 && strings.HasSuffix(os.Args[1], "runtime_check.js") {
features := []string{"workspace_tools", "workspace_prepare", "workspace_command_observations", "workspace_read", "workspace_directory"}
features := []string{"workspace_tools", "workspace_prepare", "workspace_command_observations", "workspace_directory"}
if mode == "old-runtime" {
features = []string{"workspace_tools"}
} else if mode == "old-command-runtime" {
Expand Down Expand Up @@ -89,10 +89,6 @@ func runPreparationHelper() {
runWorkspaceDirectoryHelper(scanner, state, mode)
return
}
if strings.HasPrefix(mode, "read-") {
runWorkspaceReadHelper(scanner, state, mode)
return
}
if !scanner.Scan() {
return
}
Expand Down
1 change: 0 additions & 1 deletion apps/daemon/internal/agent/claudesdk/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ type session struct {
cancelOutput chan struct{}
nativeEnded bool

reads workspaceReadState
directories workspaceDirectoryState
process *clirunner.Process
writeMu *sync.Mutex
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,8 @@ func liveWorkspaceDirectoryFixtures(t *testing.T, root string) {
}
}

func liveWorkspaceDirectories(t *testing.T, ctx context.Context, reader agent.WorkspaceReader, root, stage string) {
func liveWorkspaceDirectories(t *testing.T, ctx context.Context, lister agent.WorkspaceDirectoryLister, root, stage string) {
t.Helper()
lister, ok := reader.(agent.WorkspaceDirectoryLister)
if !ok {
t.Fatal("workspace directory owner missing")
}
result, err := lister.ListWorkspaceDirectory(ctx, "", 1000)
if err != nil || result.Truncated {
t.Fatal("workspace directory failed", stage, err)
Expand Down
25 changes: 12 additions & 13 deletions apps/daemon/internal/agent/claudesdk/workspace_live_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,19 @@ func TestLiveClaudeWorkspaceFactory(t *testing.T) {
t.Fatal(err)
}
}
liveWorkspaceReadFixtures(t, config.Workspace.Directory)
liveWorkspaceDirectoryFixtures(t, config.Workspace.Directory)
heartbeat := filepath.Join(config.Workspace.Directory, "heartbeat.txt")
artifact := filepath.Join(config.Workspace.Directory, "value.txt")
type evidence struct {
Reads []liveWorkspaceRead `json:"reads,omitempty"`
RunID string `json:"run_id"`
Events []proto.Envelope `json:"events"`
Done proto.DonePayload `json:"done"`
Failure string `json:"failure,omitempty"`
Cancelled bool `json:"cancelled"`
CancelMS int64 `json:"cancel_ms,omitempty"`
BridgePID int `json:"bridge_pid"`
Terminals int `json:"terminals"`
Heartbeats []string `json:"heartbeats,omitempty"`
RunID string `json:"run_id"`
Events []proto.Envelope `json:"events"`
Done proto.DonePayload `json:"done"`
Failure string `json:"failure,omitempty"`
Cancelled bool `json:"cancelled"`
CancelMS int64 `json:"cancel_ms,omitempty"`
BridgePID int `json:"bridge_pid"`
Terminals int `json:"terminals"`
Heartbeats []string `json:"heartbeats,omitempty"`
}
writeEvidence := func(name string, proof evidence) {
t.Helper()
Expand Down Expand Up @@ -106,7 +105,7 @@ func TestLiveClaudeWorkspaceFactory(t *testing.T) {
s := running.(*session)
defer s.Cancel(context.Background())
proof.BridgePID = s.process.Cmd.Process.Pid
proof.Reads = append(proof.Reads, liveWorkspaceReads(t, ctx, s, config.Workspace.Directory, "active", "read-binary.bin", "read-empty.bin", "read-large.bin")...)
liveWorkspaceDirectories(t, ctx, s, config.Workspace.Directory, "active")
ticker := time.NewTicker(80 * time.Millisecond)
defer ticker.Stop()
for out != nil {
Expand All @@ -116,7 +115,7 @@ func TestLiveClaudeWorkspaceFactory(t *testing.T) {
case <-ticker.C:
value, _ := os.ReadFile(heartbeat)
if cancelOnEffect && !proof.Cancelled && len(value) > 0 && string(value) != "0" && string(value) != "1" {
proof.Reads = append(proof.Reads, liveWorkspaceReads(t, ctx, s, config.Workspace.Directory, "effect", "value.txt")...)
liveWorkspaceDirectories(t, ctx, s, config.Workspace.Directory, "effect")
started := time.Now()
if err := s.Cancel(ctx); err != nil {
t.Fatal("factory cancellation failed", err)
Expand Down
196 changes: 0 additions & 196 deletions apps/daemon/internal/agent/claudesdk/workspace_read.go

This file was deleted.

This file was deleted.

Loading
Loading