Merge pull request #396 from depot/billy/fix/claude-code-org-id

feat: use org ID sent from the API

Author: billyb2

pkg/api/rpc.go

@@ -44,10 +44,6 @@ func NewClaudeClient() agentv1connect.ClaudeServiceClient {
 	return agentv1connect.NewClaudeServiceClient(getHTTPClient(getBaseURL()), getBaseURL(), WithUserAgent())
 }
 
-func NewAgentClient() agentv1connect.AgentServiceClient {
-	return agentv1connect.NewAgentServiceClient(getHTTPClient(getBaseURL()), getBaseURL(), WithUserAgent())
-}
-
 func NewSessionClient() agentv1connect.SessionServiceClient {
 	return agentv1connect.NewSessionServiceClient(getHTTPClient(getBaseURL()), getBaseURL(), WithUserAgent())
 }

pkg/cmd/claude/claude.go

@@ -355,7 +355,7 @@ func saveSession(ctx context.Context, client agentv1connect.SessionServiceClient
 
 		req := &agentv1.UploadSessionRequest{
 			SessionData:   data,
-			SessionId:     sessionID,
+			SessionId:     &sessionID,
 			Summary:       new(string),
 			ToolSessionId: claudeSessionID,
 			AgentType:     agentv1.AgentType_AGENT_TYPE_CLAUDE_CODE,

pkg/cmd/claude/remote.go

@@ -139,16 +139,17 @@ func RunAgentRemote(ctx context.Context, opts *AgentRemoteOptions) error {
 
 	sessionID := res.Msg.SessionId
 	sandboxID := res.Msg.SandboxId
+	orgID := res.Msg.OrganizationId
 
 	// If not waiting, just print the URL and exit
 	if !opts.Wait {
 		fmt.Fprintf(opts.Stdout, "\n✓ Claude sandbox started!\n")
 		fmt.Fprintf(opts.Stdout, "  Session ID: %s\n", sessionID)
-		fmt.Fprintf(opts.Stdout, "  Link: https://depot.dev/orgs/%s/claude/%s\n", opts.OrgID, sessionID)
+		fmt.Fprintf(opts.Stdout, "  Link: https://depot.dev/orgs/%s/claude/%s\n", orgID, sessionID)
 		return nil
 	}
 
-	return waitAndStreamSandbox(ctx, sandboxClient, token, sessionID, sandboxID, opts.OrgID, invocationTime, opts.Stdout, opts.Stderr)
+	return waitAndStreamSandbox(ctx, sandboxClient, token, sessionID, sandboxID, orgID, invocationTime, opts.Stdout, opts.Stderr)
 }
 
 func isGitURL(s string) bool {